Commit Graph

730 Commits

Author SHA1 Message Date
5b3accdc53 Hotfix to remove media uploads entirely on del and redraft compose form since it was tricking user into thinking it would retain the media when submitted 2020-08-10 18:18:23 -05:00
1697731ad7 Merge branch 'markdown-hotfix' into 'develop'
list markdown hotfix

Closes #279

See merge request soapbox-pub/soapbox-fe!148
2020-08-10 20:30:53 +00: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
e6b5ef24eb list markdown hotfix 2020-08-10 15:20:09 -05: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
3fc91c2c1d Revert "Merge branch 'bullet_point_css' into 'develop'"
This reverts commit bf3de8adc5, reversing
changes made to a892e3ce81.
2020-08-10 10:48:41 -05:00
02a1bb47cf Fix poll X button 2020-08-10 09:25:57 -06:00
f3893effbe Fix bullet point css issue 2020-08-09 22:27:55 -06:00
c91ca7edd6 Fix toggle CSS 2020-08-09 15:23:27 -06: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
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
edb15ce150 Merge branch 'user-verification' of gitlab.com:soapbox-pub/soapbox-fe into user-verification 2020-08-07 17:01:41 -05:00
e9d76b6287 Update chained get requests 2020-08-07 17:01:15 -05: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
56bac95ad4 Toggle for all notification sounds 2020-08-06 11:54:58 -06:00
6e782ca3a0 Modified Profile bio to use textarea, preserving newlines and HTML rendered 2020-08-05 19:08:38 -05:00
f07de93ee3 Merge branch 'emoji-rendering-hotfix' into 'develop'
Only render emoji selector in the dom when needed

See merge request soapbox-pub/soapbox-fe!131
2020-08-05 21:04:41 +00:00
769a512445 only render emoji selector in the dom when needed 2020-08-05 15:53:30 -05:00
aadde55262 Merge branch 'hover-card-display-hotfix' into 'develop'
Only render a hover profile card in the dom when relevant

See merge request soapbox-pub/soapbox-fe!130
2020-08-05 20:50:55 +00:00
e6ee961016 Only render a hover profile card in the dom when relevant 2020-08-05 14:27:42 -05:00
39d29f4e25 Update account colors to be more silimar to existing Soapbox color patterns 2020-08-05 13:20:46 -05:00
aec44bfea6 Verified: Use getIn in display_name.js 2020-08-05 18:04:32 +00:00
f7f0439e72 prevent verified users from updating display name on frontend 2020-08-05 12:47:45 -05:00
c9b2b66283 add verification icon on verified users 2020-08-05 12:08:52 -05:00
ab3f53cb27 styles on filter form 2020-08-04 21:57:54 -05:00
69184ef97c add and remove muted words, filters 2020-08-04 21:15:16 -05:00
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
bdd9204b3c basic filter form component set up 2020-08-04 15:21:42 -05:00