Commit graph

155 commits

Author SHA1 Message Date
crockwave
d70aa302b2 Added suffix to Back to <instance> button on public_layout header and created translations 2020-08-07 16:58:10 -05:00
Curtis
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
Alex Gleason
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
marykatefain
68f765da28 Multi-Factor Auth with OTP 2020-08-07 20:17:13 +00:00
Alex Gleason
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
crockwave
a5b69e77a3 Added Admin settings opening in new tab 2020-08-07 12:58:59 -05:00
Sean King
56bac95ad4 Toggle for all notification sounds 2020-08-06 11:54:58 -06:00
Curtis ROck
0830d227a5 Added translations for public_header text elements 2020-08-05 21:12:15 -05:00
Mary Kate
769a512445 only render emoji selector in the dom when needed 2020-08-05 15:53:30 -05:00
crockwave
3d24cfaf53 Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value 2020-08-04 18:05:16 -05:00
Alex Gleason
eeaf9f0b8e
HoverCard: Do the JS way on DetailedStatus too 2020-08-03 00:40:13 -05:00
Alex Gleason
2c010768e9 Merge branch 'profile-hover-cards' into 'develop'
Profile hover cards

See merge request soapbox-pub/soapbox-fe!114
2020-08-03 02:27:14 +00:00
Alex Gleason
29d1debdbf
Refactor ActionButton 2020-08-02 21:16:13 -05:00
Alex Gleason
690d7154c4
HoverCard: Fix JS console errors 2020-08-02 21:05:21 -05:00
Alex Gleason
2e21c04e28
Clean up unused UserPanel code 2020-08-02 20:50:06 -05:00
Alex Gleason
24e7ce6e83
HoverCard: Improve long bio situation 2020-08-02 20:44:47 -05:00
Alex Gleason
1266585aef
HoverCard: Reposition "Follow you!" component 2020-08-02 19:50:17 -05:00
Alex Gleason
a7463dd3fc
HoverCard: Add floating NavLinks for clickthrough 2020-08-02 18:53:47 -05:00
Alex Gleason
1f5898b67d
Bring HoverCard out of NavLink 2020-08-02 18:39:32 -05:00
Alex Gleason
23e370a10b
Bookmarks: don't update constantly, fixes #263 2020-07-30 00:38:40 -05:00
Alex Gleason
59e2811a49 Merge branch 'approval-mode-fe-3' into 'develop'
Approval mode fe 3

See merge request soapbox-pub/soapbox-fe!117
2020-07-29 22:17:18 +00:00
marykatefain
ee97e94779 Bookmark posts 2020-07-29 21:08:36 +00:00
Sean King
84b4681b50 Fix detailed status 2020-07-29 11:51:29 -06:00
Mary Kate
d99e5d543c fix linter 2020-07-28 21:46:27 -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
Mary Kate
209f826c15 add reason field on registration when by approval mode is on 2020-07-28 21:43:27 -05:00
Mary Kate
d76f4d422e update detail status page and mobile settings for porfile hover card 2020-07-28 20:59:14 -05:00
Mary Kate
f6ebe5cbd7 profile card basic functionality, needs some UI improvements 2020-07-28 20:02:11 -05:00
Alex Gleason
444e3641ee
Fix disappearing poll button when media is uploaded 2020-07-28 14:42:58 -05:00
Alex Gleason
1329ca3578
Merge remote-tracking branch 'origin/develop' into add-images-to-polls 2020-07-28 14:18:30 -05:00
Bárbara de Castro Fernandes
563e4e5bab Show profile preview on hover 2020-07-28 14:15:57 -05:00
Mary Kate
a3201605b4 add uploads to polls 2020-07-28 14:15:15 -05:00
Alex Gleason
ac6b4033dd
Merge remote-tracking branch 'origin/develop' into add-markdown-posts 2020-07-28 14:00:25 -05:00
Alex Gleason
b31cf22f43
Markdown refactoring 2020-07-28 13:43:22 -05:00
Mary Kate
daf039d9bb generalize markdown to content_type 2020-07-28 13:31:44 -05:00
Mary Kate
bc787e0bbe add markdown posts 2020-07-28 12:24:04 -05:00
Alex Gleason
2aca716cfa
Revert "Merge branch 'decouple_spoiler_from_nsfw' into 'develop'"
This reverts commit 03c2a8f294, reversing
changes made to b6c0884a1d.
2020-07-28 10:52:29 -05:00
Mary Kate
7fd8c860b6 add toggle to collapse and expand Fediverse tab explaination box, fixes #63 2020-07-26 17:49:43 -05:00
Alex Gleason
e8288ffdf8
Fix theme-toggle v-align issues 2020-07-20 15:34:54 -05:00
Alex Gleason
c0dc03b3e4
Deactivate --> Delete 2020-07-20 15:23:38 -05:00
Alex Gleason
79dcbd781d Merge branch 'deactivate_account_from_profile' into 'develop'
Deactivate account from profile. Fixes #153

Closes #153

See merge request soapbox-pub/soapbox-fe!87
2020-07-20 19:55:02 +00:00
Sean King
1a0c3131bf Spacing fix 2020-07-19 19:03:39 -06:00
Sean King
9df1b085cb ThemeToggle class 2020-07-19 18:50:09 -06:00
Sean King
277f4b5f22 Move ThemeToggle to separate class, style it, and fix it on mobile 2020-07-19 18:44:17 -06:00
Sean King
796bf9c844 Change design of toggle button 2020-07-19 15:50:16 -06:00
Sean King
54d7fbdc5a Remove top navbar's auto-hide 2020-07-12 16:39:18 -06:00
Alex Gleason
a9347a9d27 Merge branch 'fix-theme-toggle-bug' into 'develop'
Fix a bug where the theme toggle doesn't show the proper icon if the themeMode is not set

See merge request soapbox-pub/soapbox-fe!98
2020-07-12 04:07:19 +00:00
Sean King
03c63fa36d Fix a bug where it doesn't show the proper icon if the themeMode is not set 2020-07-11 21:29:57 -06:00
Alex Gleason
49a3211777 Merge branch 'theme-toggle' into 'develop'
Light/dark theme toggle in top navbar

See merge request soapbox-pub/soapbox-fe!97
2020-07-11 20:40:26 +00:00