Alex Gleason
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
Mary Kate
c6a4db7528
Fix 504 error when visiting account you've blocked
2020-08-14 17:23:31 -05:00
crockwave
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
Alex Gleason
39d9b20431
Merge remote-tracking branch 'origin/develop' into profile-media-panel
2020-08-14 16:25:25 -05:00
Alex Gleason
fdbe981477
Fix timeline queue header when filters are enabled
2020-08-14 16:01:30 -05:00
Mary Kate
30983571b1
add profile media panel
2020-08-14 14:32:32 -05:00
Alex Gleason
bd65a1b3f5
Filter out reposts in local timeline by default, fixes #307
2020-08-14 12:42:03 -05:00
Curtis ROck
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
Alex Gleason
bb5854c310
Merge branch 'remove_duplicate_quick_filter' into 'develop'
...
Remove dupilcate Quick Filter bar toggle in notification settings, fixes #296
Closes #296
See merge request soapbox-pub/soapbox-fe!158
2020-08-14 01:37:08 +00:00
crockwave
8b2c7b344b
Trying to get blank customCss field to appear on virgin usage
2020-08-13 19:04:54 -05:00
Curtis
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
Alex Gleason
101f519d4b
Spinster migration hotfix: fix locale set to ""
2020-08-13 04:46:45 -05:00
Alex Gleason
e7bd011495
Streaming: Add locale fallback for invalid locale
2020-08-13 04:20:35 -05:00
Alex Gleason
6652df35b3
Run yarn manage:translations
2020-08-13 03:45:58 -05:00
Curtis ROck
06186f85c8
continued debugging
2020-08-12 20:52:32 -05:00
crockwave
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
Sean King
d49d8bc145
Remove dupilcate quickFilter in notification settings
2020-08-12 13:39:13 -06:00
Mary Kate
9b85b4ad7f
remove info from deactivated account pages
2020-08-12 13:06:28 -05:00
crockwave
0f70fde172
action_bar had a poor merge conflict correction fixed.
...
Still experimenting with updating nested state
2020-08-11 18:41:03 -05:00
Alex Gleason
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
Sean King
aa494560ae
Beginning works of remote follow based on Pleroma FE version~
2020-08-11 11:49:15 -06:00
Curtis ROck
207750aef4
Trying immutable functions to modify state object
2020-08-11 06:30:54 -05:00
Sean King
72433b6bd0
Translation strings for FeaturesPanel
2020-08-10 21:03:28 -06:00
Mary Kate
c4046cbf7e
add video and audio media placeholders in compose form
2020-08-10 20:59:24 -05:00
crockwave
e6d009d4f2
Trying to update nested state on element change events
2020-08-10 19:29:38 -05:00
marykatefain
202b8e145f
Revert "Remove unnecessary video preview url that was fixing video previews"
...
This reverts commit f56e156d21f2c8a815aca2aa1445e659295f4218.
2020-08-11 00:12:26 +00:00
Alex Gleason
767a491aa9
Merge branch 'redraft-remove-media' into 'develop'
...
Remove broken media upload from Del & Redraft composer
See merge request soapbox-pub/soapbox-fe!150
2020-08-10 23:29:26 +00:00
Mary Kate
5b3accdc53
Hotfix to remove media uploads entirely on del and redraft compose form since it was tricking user into thinking it would retain the media when submitted
2020-08-10 18:18:23 -05:00
Alex Gleason
c9b925d252
Fix edit profile checkbox state, fixes #261 #284
2020-08-10 16:17:39 -05:00
crockwave
a001fa2dfe
Merge branch 'admin_cfg' of https://gitlab.com/soapbox-pub/soapbox-fe into admin_cfg
2020-08-10 15:33:34 -05:00
Alex Gleason
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
Mary Kate
5349045e51
Revert "only render emoji selector in the dom when needed"
...
This reverts commit 769a512445
2020-08-10 15:06:39 -05:00
Mary Kate
42a7a61ce7
border radius fixes
2020-08-10 15:05:24 -05:00
Sean King
10d1010265
New upload icon
2020-08-10 11:49:38 -06:00
Mary Kate
6ac0c615fe
fixes #278 , large awaiting approval button
2020-08-10 12:23:59 -05:00
Mary Kate
5998f52e9f
fix relationship not loading on hover card
2020-08-10 12:08:32 -05:00
Curtis
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
Alex Gleason
b30dc39f1a
Bio fixes
2020-08-09 15:13:36 -05:00
Alex Gleason
695a78503d
Verified ['pleroma', 'tags'] fix
2020-08-09 14:55:32 -05:00
Alex Gleason
d9579831e0
Merge remote-tracking branch 'origin/multi_line_bio' into develop
2020-08-09 14:45:31 -05:00
Alex Gleason
504e36c7d8
Fix linter
2020-08-09 14:44:56 -05:00
Alex Gleason
e97b9d2168
Update columns layout for all pages
2020-08-09 14:37:02 -05:00
Alex Gleason
6f6f91e2f4
Verified className fix
2020-08-09 14:32:22 -05:00
Alex Gleason
2fff5db5d5
Handle max_fields fallback differently
2020-08-09 14:01:16 -05:00
Sean King
9c505d0d84
Fix for Pleroma 2.1 and older versions regarding profile metadata
2020-08-09 10:55:39 -06:00
Curtis ROck
72a4a38fec
Refactoring to use soapbox object as state. Still buggy
2020-08-09 11:03:24 -05:00
Alex Gleason
715779653c
Rearrange home sidebars
2020-08-09 00:29:28 -05:00
Sean King
95fb1b7900
Update index.js
2020-08-09 01:40:35 +00:00
Alex Gleason
9a2fba1ef5
Revert "Revert "Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value""
...
This reverts commit b3a6c395df
2020-08-08 20:32:39 -05:00
Alex Gleason
b3a6c395df
Revert "Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value"
...
This reverts commit 3d24cfaf53
2020-08-08 18:34:35 -05:00
