71d40b3dd6
Merge branch 'develop' into 'remote_follow'
...
# Conflicts:
# app/soapbox/features/account/components/header.js
2020-08-18 17:24:12 +00:00
f4b7f2a1bf
remove deactivated proile bio hotfix
2020-08-17 22:34:27 -05:00
cb0c34aa7e
Merge branch 'deactivated-accounts' into 'develop'
...
Remove info from deactivated account pages
Closes #291
See merge request soapbox-pub/soapbox-fe!157
2020-08-18 03:15:02 +00:00
53500c44b4
Always render all columns, fixes #332 , breaks #293
2020-08-16 15:24:41 -05:00
1e06eff010
Merge branch 'page-layout-style-improvement' into 'develop'
...
Only render layout column inner div when column exists, fixes #293
Closes #293
See merge request soapbox-pub/soapbox-fe!171
2020-08-16 17:39:37 +00:00
b3a05c75ff
Merge branch 'profile-media-panel-improvments' into 'develop'
...
Profile media panel improvements, Fixes #318
Closes #318
See merge request soapbox-pub/soapbox-fe!168
2020-08-16 17:24:52 +00:00
fb16afb8f7
Merge branch 'remove-endorse-button' into 'develop'
...
remove endorse button from the profile header menu and some related funcs, fixes #328
Closes #328
See merge request soapbox-pub/soapbox-fe!174
2020-08-16 15:53:10 +00:00
9864966eb0
remove endorse button from the profile header menu and some related funcs, fixes #328
2020-08-16 10:42:55 -05:00
3da44d60bf
Revert direct_timeline to use /api/v1/timelines/direct, fixes #325
2020-08-15 23:37:50 -05:00
ca333c9552
Start refactoring direct_timeline / conversations
2020-08-15 23:18:53 -05:00
9afac986fb
Refactor oembed card to work with videos on Pleroma
2020-08-15 19:40:08 -05:00
455cb6f575
only render layout colum inner div when column exists, fixes #293
2020-08-15 18:50:42 -05:00
2f24577e7f
only show public attachments in profile media panel
2020-08-15 15:51:31 -05:00
422588178a
loading improvments for profile media panel
2020-08-15 15:19:18 -05:00
799915039b
Merge branch 'profile-media-panel' into 'develop'
...
Add profile media panel
Closes #294
See merge request soapbox-pub/soapbox-fe!162
2020-08-15 03:44:44 +00:00
dd0b0c911f
remove proile media panel from right sidebar on medium screens
2020-08-14 22:34:22 -05:00
50ccb6d010
add loading indicator to DMs, fixes #316
2020-08-14 21:11:36 -05:00
d966107f1b
Add default copyright value to reducer
...
Fixed checkbox processing
2020-08-14 19:03:11 -05:00
0f132fd3b7
Merge branch 'blocked-account-error' into 'develop'
...
Fix 504 error when visiting account you've blocked
Closes #310
See merge request soapbox-pub/soapbox-fe!164
2020-08-14 22:33:41 +00:00
c6a4db7528
Fix 504 error when visiting account you've blocked
2020-08-14 17:23:31 -05:00
cf260ec793
Handles virgin rendering, default soapbox object if soapbox.json missing, local state used only for UI changes, and retention of settings in both DB and store as soapbox object
...
Need to monitor for soapbox object dispatch events so that hitting Back causes re-render of timeline page
Need to explore refactoring update of soapbox object before being passed to API
2020-08-14 16:51:04 -05:00
39d9b20431
Merge remote-tracking branch 'origin/develop' into profile-media-panel
2020-08-14 16:25:25 -05:00
fdbe981477
Fix timeline queue header when filters are enabled
2020-08-14 16:01:30 -05:00
30983571b1
add profile media panel
2020-08-14 14:32:32 -05:00
b127ffa158
Added brandcolor tooltip on brand color button hover
...
Component renders well from virgin use
State updates well
Still breaks on Save
2020-08-13 22:25:06 -05:00
675f580d60
Resolve merge conflicts
...
Merge branch 'develop' into 'translate_public_header'
# Conflicts:
# app/soapbox/locales/ar.json
# app/soapbox/locales/ast.json
# app/soapbox/locales/bg.json
# app/soapbox/locales/bn.json
# app/soapbox/locales/br.json
# app/soapbox/locales/ca.json
# app/soapbox/locales/co.json
# app/soapbox/locales/cs.json
# app/soapbox/locales/cy.json
# app/soapbox/locales/da.json
# app/soapbox/locales/de.json
# app/soapbox/locales/defaultMessages.json
# app/soapbox/locales/el.json
# app/soapbox/locales/en.json
# app/soapbox/locales/eo.json
# app/soapbox/locales/es-AR.json
# app/soapbox/locales/es.json
# app/soapbox/locales/et.json
# app/soapbox/locales/eu.json
# app/soapbox/locales/fa.json
# app/soapbox/locales/fi.json
# app/soapbox/locales/fr.json
# app/soapbox/locales/ga.json
# app/soapbox/locales/gl.json
# app/soapbox/locales/he.json
# app/soapbox/locales/hi.json
# app/soapbox/locales/hr.json
# app/soapbox/locales/hu.json
# app/soapbox/locales/hy.json
# app/soapbox/locales/id.json
# app/soapbox/locales/io.json
# app/soapbox/locales/it.json
# app/soapbox/locales/ja.json
# app/soapbox/locales/ka.json
# app/soapbox/locales/kk.json
# app/soapbox/locales/ko.json
# app/soapbox/locales/lt.json
# app/soapbox/locales/lv.json
# app/soapbox/locales/mk.json
# app/soapbox/locales/ms.json
# app/soapbox/locales/nl.json
# app/soapbox/locales/nn.json
# app/soapbox/locales/no.json
# app/soapbox/locales/oc.json
# app/soapbox/locales/pl.json
# app/soapbox/locales/pt-BR.json
# app/soapbox/locales/pt.json
# app/soapbox/locales/ro.json
# app/soapbox/locales/ru.json
# app/soapbox/locales/sk.json
# app/soapbox/locales/sl.json
# app/soapbox/locales/sq.json
# app/soapbox/locales/sr-Latn.json
# app/soapbox/locales/sr.json
# app/soapbox/locales/sv.json
# app/soapbox/locales/ta.json
# app/soapbox/locales/te.json
# app/soapbox/locales/th.json
# app/soapbox/locales/tr.json
# app/soapbox/locales/uk.json
# app/soapbox/locales/zh-CN.json
# app/soapbox/locales/zh-HK.json
# app/soapbox/locales/zh-TW.json
2020-08-13 22:28:27 +00:00
06186f85c8
continued debugging
2020-08-12 20:52:32 -05:00
cea7723fc3
refactored to improve default soapbox object for store
...
refactored to render with local state if avail or with props
refactored to build soapbox object for api and store from local state if avail or with props
2020-08-12 17:24:14 -05:00
d49d8bc145
Remove dupilcate quickFilter in notification settings
2020-08-12 13:39:13 -06:00
9b85b4ad7f
remove info from deactivated account pages
2020-08-12 13:06:28 -05:00
0f70fde172
action_bar had a poor merge conflict correction fixed.
...
Still experimenting with updating nested state
2020-08-11 18:41:03 -05:00
34bf11f512
Merge branch 'media-compose-placeholders' into 'develop'
...
Add video and audio media placeholders in compose form
Closes #234
See merge request soapbox-pub/soapbox-fe!152
2020-08-11 19:23:44 +00:00
aa494560ae
Beginning works of remote follow based on Pleroma FE version~
2020-08-11 11:49:15 -06:00
207750aef4
Trying immutable functions to modify state object
2020-08-11 06:30:54 -05:00
72433b6bd0
Translation strings for FeaturesPanel
2020-08-10 21:03:28 -06:00
c4046cbf7e
add video and audio media placeholders in compose form
2020-08-10 20:59:24 -05:00
e6d009d4f2
Trying to update nested state on element change events
2020-08-10 19:29:38 -05:00
202b8e145f
Revert "Remove unnecessary video preview url that was fixing video previews"
...
This reverts commit f56e156d21f2c8a815aca2aa1445e659295f4218.
2020-08-11 00:12:26 +00:00
c9b925d252
Fix edit profile checkbox state, fixes #261 #284
2020-08-10 16:17:39 -05:00
a001fa2dfe
Merge branch 'admin_cfg' of https://gitlab.com/soapbox-pub/soapbox-fe into admin_cfg
2020-08-10 15:33:34 -05:00
ae8c1b88d4
Merge branch 'small-fixes' into 'develop'
...
Small fixes
Closes #278 and #266
See merge request soapbox-pub/soapbox-fe!147
2020-08-10 20:28:14 +00:00
5349045e51
Revert "only render emoji selector in the dom when needed"
...
This reverts commit 769a512445
2020-08-10 15:06:39 -05:00
42a7a61ce7
border radius fixes
2020-08-10 15:05:24 -05:00
10d1010265
New upload icon
2020-08-10 11:49:38 -06:00
6ac0c615fe
fixes #278 , large awaiting approval button
2020-08-10 12:23:59 -05:00
5998f52e9f
fix relationship not loading on hover card
2020-08-10 12:08:32 -05:00
ea94b05608
Resolve merge conflicts
...
Merge branch 'develop' into 'admin_cfg'
# Conflicts:
# app/soapbox/features/compose/components/action_bar.js
# app/soapbox/features/edit_profile/index.js
2020-08-09 23:02:48 +00:00
b30dc39f1a
Bio fixes
2020-08-09 15:13:36 -05:00
695a78503d
Verified ['pleroma', 'tags'] fix
2020-08-09 14:55:32 -05:00
d9579831e0
Merge remote-tracking branch 'origin/multi_line_bio' into develop
2020-08-09 14:45:31 -05:00
