Commit graph

17 commits

Author SHA1 Message Date
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
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
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
Mary Kate
69184ef97c add and remove muted words, filters 2020-08-04 21:15:16 -05:00
crockwave
c8ba54c7a1 Fixed linter warning in colorpicker render. Fixed button-secondary hover contrast issue 2020-08-03 14:53:12 -05:00
Alex Gleason
c3be47fca6
Merge remote-tracking branch 'origin/develop' into admin_cfg 2020-08-03 01:43:54 -05:00
Sean King
e95366b572 Fix color picker so that a POST request is not done by default every time it opens 2020-08-02 16:17:34 -06:00
Sean King
49b8ecd639 Fix merge conflict. 2020-08-02 20:47:52 +00:00
Sean King
f398dde5cb Color picker for admin config 2020-08-02 14:41:26 -06:00
crockwave
1f6ca55366 Limit logo upload to either SVG or PNG 2020-08-02 14:07:13 -05:00
Mary Kate
774adf9baa update reason or joining form to simpletextarea 2020-07-28 21:43:27 -05:00
Mary Kate
4ce5ba6c1a textarea input 2020-07-28 21:43:27 -05:00
Alex Gleason
144469cda9
Test: Form input snapshots 2020-06-09 23:00:26 -05:00
Alex Gleason
6ee3d77e55
Forms: set id in state, fixes #178 2020-06-09 18:26:49 -05:00
Alex Gleason
289f90dd4e
Fix PropType errors 2020-06-07 17:18:26 -05:00
Alex Gleason
86508da96e
EditProfile: i18n 2020-06-06 15:52:33 -05:00
Alex Gleason
d24dcb3e60
gabsocial --> soapbox paths 2020-05-28 17:56:55 -05:00