Commit graph

212 commits

Author SHA1 Message Date
Alex Gleason
b7a6d7d261
admin_cfg: Improve + icon style 2020-08-23 15:31:49 -05:00
Alex Gleason
2cdf6f7275
Merge remote-tracking branch 'origin/develop' into admin_cfg 2020-08-23 12:16:52 -05:00
Alex Gleason
cb0c34aa7e Merge branch 'deactivated-accounts' into 'develop'
Remove info from deactivated account pages

Closes #291

See merge request soapbox-pub/soapbox-fe!157
2020-08-18 03:15:02 +00:00
Alex Gleason
1e06eff010 Merge branch 'page-layout-style-improvement' into 'develop'
Only render layout column inner div when column exists, fixes #293

Closes #293

See merge request soapbox-pub/soapbox-fe!171
2020-08-16 17:39:37 +00:00
Alex Gleason
16e83b39b8 Merge branch 'markdown-list-style-improvements' into 'develop'
Improvements to markdown list styles

Closes #300

See merge request soapbox-pub/soapbox-fe!170
2020-08-16 17:28:00 +00:00
Mary Kate
37744b60be corners on DMs 2020-08-16 10:58:51 -05:00
Mary Kate
455cb6f575 only render layout colum inner div when column exists, fixes #293 2020-08-15 18:50:42 -05:00
Mary Kate
8818363149 improvements to markdown list styles 2020-08-15 17:54:52 -05:00
Mary Kate
368baf818e Merge branch 'profile-media-panel' of gitlab.com:soapbox-pub/soapbox-fe into profile-media-panel 2020-08-14 17:46:44 -05:00
Mary Kate
68daa5fbe9 use cover rather than contain on media gallary except on statuses 2020-08-14 17:46:21 -05:00
Alex Gleason
39d9b20431
Merge remote-tracking branch 'origin/develop' into profile-media-panel 2020-08-14 16:25:25 -05:00
Mary Kate
30983571b1 add profile media panel 2020-08-14 14:32:32 -05:00
Mary Kate
dc9f5c3a6a slight overflow imrpovements, fixes #303 2020-08-13 15:48:33 -05:00
Mary Kate
16d68e0bef styles for nested markdown, fixes #295 2020-08-12 15:09:21 -05:00
Mary Kate
9b85b4ad7f remove info from deactivated account pages 2020-08-12 13:06:28 -05:00
Mary Kate
45ded363f1 update markdown styles 2020-08-11 18:31:16 -05:00
Mary Kate
c4046cbf7e add video and audio media placeholders in compose form 2020-08-10 20:59:24 -05:00
Mary Kate
e85baee486 fix overflow on list index 2020-08-10 16:35:34 -05:00
Alex Gleason
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
Alex Gleason
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
Mary Kate
e6b5ef24eb list markdown hotfix 2020-08-10 15:20:09 -05:00
Mary Kate
42a7a61ce7 border radius fixes 2020-08-10 15:05:24 -05:00
Alex Gleason
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
Sean King
02a1bb47cf Fix poll X button 2020-08-10 09:25:57 -06:00
Sean King
f3893effbe Fix bullet point css issue 2020-08-09 22:27:55 -06: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
Sean King
c91ca7edd6 Fix toggle CSS 2020-08-09 15:23:27 -06:00
Alex Gleason
b30dc39f1a
Bio fixes 2020-08-09 15:13:36 -05:00
Alex Gleason
504e36c7d8
Fix linter 2020-08-09 14:44:56 -05:00
Alex Gleason
715779653c
Rearrange home sidebars 2020-08-09 00:29:28 -05:00
Alex Gleason
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
Mary Kate
7931a9a89d code review 2020-08-07 18:10:13 -05:00
Mary Kate
e9d76b6287 Update chained get requests 2020-08-07 17:01:15 -05:00
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
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
Mary Kate
39d29f4e25 Update account colors to be more silimar to existing Soapbox color patterns 2020-08-05 13:20:46 -05:00
Mary Kate
f7f0439e72 prevent verified users from updating display name on frontend 2020-08-05 12:47:45 -05:00
Mary Kate
c9b2b66283 add verification icon on verified users 2020-08-05 12:08:52 -05:00
Mary Kate
ab3f53cb27 styles on filter form 2020-08-04 21:57:54 -05:00
Mary Kate
69184ef97c add and remove muted words, filters 2020-08-04 21:15:16 -05:00
Alex Gleason
eeaf9f0b8e
HoverCard: Do the JS way on DetailedStatus too 2020-08-03 00:40:13 -05:00
Alex Gleason
35c9574c2f
HoverCard: Handle delay in JS instead of CSS 2020-08-02 23:47:19 -05:00
Alex Gleason
5081dd73c0
HoverCard: Reposition badges 2020-08-02 23:14:31 -05:00
Alex Gleason
9a5046179b
HoverCard: Reposition ActionButton 2020-08-02 23:10:36 -05:00
Alex Gleason
e02ff2bed3
HoverCard: Style stats 2020-08-02 23:01:38 -05:00
Alex Gleason
e943dc8b4c
UserPanel: Don't wrap text 2020-08-02 22:19:52 -05:00
Alex Gleason
4197e8e833
HoverCard: Prevent floating avatars from intercepting with current card 2020-08-02 22:13:32 -05:00
Alex Gleason
feec86718d
Display name fixes 2020-08-02 22:06:57 -05:00
Alex Gleason
3fd255cc0a
HoverCard: Style <a> color 2020-08-02 21:46:56 -05:00