Commit graph

8 commits

Author SHA1 Message Date
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
marykatefain
68f765da28 Multi-Factor Auth with OTP 2020-08-07 20:17:13 +00:00
Sean King
ea85c424a4 Fix site logo and banner rendering when no logo or banner is set 2020-08-02 20:52:23 -06:00
Sean King
e0ac688017 Switch to Back to <instance name> when logged in on mobile view as well. 2020-06-08 02:00:49 +00:00
Alex Gleason
346d84351c
LandingPage: Conditionally show "Back to {site_title}" instead of login form, fixes #135 2020-06-07 16:16:47 -05:00
Alex Gleason
0d76b761ac
class --> className 2020-06-04 21:13:38 -05:00
Alex Gleason
6f8ca44984
Homepage css fixes 2020-06-01 23:26:02 -05:00
Alex Gleason
d24dcb3e60
gabsocial --> soapbox paths 2020-05-28 17:56:55 -05:00