Commit Graph

2646 Commits

Author SHA1 Message Date
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
504e36c7d8 Fix linter 2020-08-09 14:44:56 -05:00
e97b9d2168 Update columns layout for all pages 2020-08-09 14:37:02 -05:00
6f6f91e2f4 Verified className fix 2020-08-09 14:32:22 -05:00
2fff5db5d5 Handle max_fields fallback differently 2020-08-09 14:01:16 -05:00
9c505d0d84 Fix for Pleroma 2.1 and older versions regarding profile metadata 2020-08-09 10:55:39 -06:00
72a4a38fec Refactoring to use soapbox object as state. Still buggy 2020-08-09 11:03:24 -05:00
715779653c Rearrange home sidebars 2020-08-09 00:29:28 -05:00
95fb1b7900 Update index.js 2020-08-09 01:40:35 +00:00
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
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
ae608388a0 add DM filter option for Home timeline, fixes #254 2020-08-07 20:47:04 -05:00
e116745e83 timeline filtering improvements 2020-08-07 19:28:30 -05:00
4ee0fa8160 Merge branch 'user-verification' into 'develop'
Display user verification icon

See merge request soapbox-pub/soapbox-fe!128
2020-08-07 23:23:11 +00:00
7931a9a89d code review 2020-08-07 18:10:13 -05:00
e9d76b6287 Update chained get requests 2020-08-07 17:01:15 -05:00
d70aa302b2 Added suffix to Back to <instance> button on public_layout header and created translations 2020-08-07 16:58:10 -05:00
6435bb0bc5 Resolved merge conflicts
Merge branch 'develop' into 'translate_public_header'

# Conflicts:
#   app/soapbox/features/public_layout/components/header.js
2020-08-07 20:53:42 +00:00
36e634b0aa Resolved merge conflicts
Merge branch 'develop' into 'timeline-word-filters'

# Conflicts:
#   app/soapbox/components/sidebar_menu.js
#   app/styles/application.scss
2020-08-07 20:46:44 +00:00
92f43566e0 Merge branch 'mfa' into 'develop'
Multi-Factor Auth with OTP

See merge request soapbox-pub/soapbox-fe!124
2020-08-07 20:17:13 +00:00
68f765da28 Multi-Factor Auth with OTP 2020-08-07 20:17:13 +00:00
2b5c0a95d2 Merge branch 'all_sound_toggle' into 'develop'
Toggle for all notification sounds, fixes #260

Closes #260

See merge request soapbox-pub/soapbox-fe!134
2020-08-07 20:06:38 +00:00
a5b69e77a3 Added Admin settings opening in new tab 2020-08-07 12:58:59 -05:00