Commit graph

118 commits

Author SHA1 Message Date
Curtis
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
marykatefain
68f765da28 Multi-Factor Auth with OTP 2020-08-07 20:17:13 +00:00
Mary Kate
69184ef97c add and remove muted words, filters 2020-08-04 21:15:16 -05:00
Mary Kate
f6ebe5cbd7 profile card basic functionality, needs some UI improvements 2020-07-28 20:02:11 -05:00
Sean King
277f4b5f22 Move ThemeToggle to separate class, style it, and fix it on mobile 2020-07-19 18:44:17 -06:00
Alex Gleason
4e94c5d2ca
Merge branch 'develop' into audio-player 2020-07-02 16:32:50 -05:00
Sean King
01d042f80d
Update of work on audio player 2020-07-02 16:31:43 -05:00
Bárbara de Castro Fernandes
2da584b5ee Create StillImage component 2020-06-15 16:43:24 -03:00
Alex Gleason
9cc9065efd
Fix missing video player styles, fix notification icon color 2020-06-02 21:35:25 -05:00
Alex Gleason
077278b7dc
Break out components.scss 2020-06-02 21:11:01 -05:00
Alex Gleason
eb9517873d
Extrapolate meta colors in css instead of JS 2020-06-02 15:28:15 -05:00
Alex Gleason
6b6c9f41ea
Reorganize styles directory 2020-05-31 23:21:25 -05:00
Alex Gleason
d5632851fe
Delete unused admin.scss and scrollbars.scss 2020-05-30 22:39:08 -05:00
Alex Gleason
d24dcb3e60
gabsocial --> soapbox paths 2020-05-28 17:56:55 -05:00
Alex Gleason
6e13cb8c9b
Improve detailed status action buttons 2020-05-21 20:33:55 -05:00
Alex Gleason
c8f89ce8c1
Style the StatusInteractionBar 2020-05-20 13:11:44 -05:00
Alex Gleason
8efc9c700e
Fix styling of hotkeys modal 2020-04-11 15:20:47 -05:00
Alex Gleason
b1b5dc62db
Initial commit 2020-03-27 15:59:38 -05:00