mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
2 697 Commity
215 Gałęzie
14 Tagi
94 MiB
Wykres commitów

524 Commity (9b723794b53449770a578483d2e9b1487d3e3335)

Autor SHA1 Wiadomość Data
Alex Gleason b7bc013acc
Demetricator fixes, closes #543 2021-01-15 13:10:50 -06:00
Alex Gleason ddac13d308
Account backups 2021-01-07 14:17:06 -06:00
Alex Gleason e261a13430
Display modal in registration window when confirmations and/or approval are required 2021-01-02 20:56:41 -06:00
Alex Gleason c5641a566d
Admin: add link to moderation log within reports 2021-01-01 14:06:12 -06:00
Alex Gleason 39436bc07c
Admin: basic moderation log 2021-01-01 12:50:53 -06:00
Alex Gleason 478581cb41
Reports: add links 2020-12-31 22:56:17 -06:00
Alex Gleason 142606d43a
Reports: refactor ReportStatus, allow deleting individual statuses 2020-12-31 22:20:31 -06:00
Alex Gleason 2fd3c9441c
Reports: display reported posts 2020-12-31 20:47:15 -06:00
Alex Gleason 35a148d9c9
Reports: allow closing a report 2020-12-31 18:24:52 -06:00
Alex Gleason 95c4ba4234
Reports: allow deactivating a user 2020-12-31 17:54:08 -06:00
Alex Gleason a16e709ff4
Reports: break out separate Report component, basic styling 2020-12-31 17:25:21 -06:00
Alex Gleason 0837bd0495
Admin Reports: display basic information 2020-12-31 15:05:39 -06:00
Alex Gleason a0c24dbbcc
Admin: improve approval UI for mobile, display snackbar messages 2020-12-31 10:56:43 -06:00
Alex Gleason 560d9d642c
Admin: display nav on mobile 2020-12-30 08:43:24 -06:00
Alex Gleason ef74f8ec69
Admin: improve dashcounters mobile styles 2020-12-30 00:53:36 -06:00
Alex Gleason eec89aaeb5
Refactor TabsBar, refactor IconWithBadge, use Dashboard nav 2020-12-29 20:26:26 -06:00
Alex Gleason 03344756e5
Admin: display awaiting-approval counter in nav 2020-12-29 19:48:39 -06:00
Alex Gleason a3f208c1be
Admin: make awaiting approval actions work 2020-12-29 18:22:31 -06:00
Alex Gleason 0ccc113931
Admon: add dummy placeholder links 2020-12-29 14:16:19 -06:00
Alex Gleason d3daf63dd5
Start admin area, create dashboard 2020-12-29 12:34:23 -06:00
Alex Gleason b6bec67eea
RemoteTimeline: add filter box 2020-12-24 16:39:57 -06:00
Sean King 8863f43d4a
Place imports for fonts from elsewhere at top 2020-11-11 11:24:31 -07:00
Sean King a21bedfabc
Use fontsource to handle Montserrat and Roboto, and use SASS to import dependency fonts 2020-11-11 10:01:59 -07:00
Sean King cf27b2799b
Remove unnecessary div in account section headline 2020-11-10 20:38:18 -07:00
Sean King d769ee7c90
Refactor promo and features panels 2020-11-10 17:22:02 -07:00
Sean King 707f873094
Add server information page for mobile devices 2020-10-31 18:58:06 -06:00
Sean King d34b705c5a
Remove outline from focusing whenever in Chromium-based browser 2020-10-28 08:49:50 -06:00
Alex Gleason a36f172be9 Merge branch 'icon_picker_admin_config' into 'develop' 
Add font icon picker for admin config, fixes #338

Closes #338

See merge request soapbox-pub/soapbox-fe!219
 2020-10-28 03:57:06 +00:00
Sean King 9507b7a82f
Use forked Emoji Mart picker to do the font icon picker instead 2020-10-16 19:35:28 -06:00
Sean King 3d64f9647c
Work on using Emoji Mart picker 2020-10-16 10:55:35 -06:00
Curtis 7f316e5335 Update basics.scss Fixes #484 2020-10-14 22:13:33 +00:00
Sean King 8385e30df1
Clean up CSS and move IconPicker to the Soapbox Config js 2020-10-14 08:46:45 -06:00
Sean King 9ebf166739
Fix merge conflicts 2020-10-14 08:22:42 -06:00
Alex Gleason 263b7ddff8
Stylelint: stricter config, lint existing scss 2020-10-11 17:28:43 -05:00
Alex Gleason 18a823ab0d Merge branch 'remove-floral-pro-css-bg' into 'develop' 
Remove pro/floral CSS and background, fixes #472

Closes #472

See merge request soapbox-pub/soapbox-fe!342
 2020-10-09 21:35:38 +00:00
Sean King 664ba68269
Fix mobile CSS for closed registrations 2020-10-09 14:34:56 -06:00
Sean King 31259fcc04
Remove pro/floral CSS and background 2020-10-09 12:22:27 -06:00
Sean King c2ebd65920
Fix pre element width on About pages 2020-10-07 19:15:17 -06:00
Alex Gleason f70a1814ec
Fixes #463 unwanted emoji background 2020-10-05 21:20:39 -05:00
Alex Gleason 2291e570ce
Forms: delete left border from select arrow for now 2020-10-04 22:26:00 -05:00
Alex Gleason a817deffa0
SoapboxConfig: button styles 2020-10-01 21:48:24 -05:00
Alex Gleason 5d5ca6ed85
Forms: improve select arrow CSS 2020-10-01 21:04:00 -05:00
Alex Gleason d65eedb67b
SoapboxConfig: style improvements 2020-10-01 20:53:11 -05:00
Alex Gleason 93d2e83584
SoapboxConfig: site preview 2020-10-01 18:57:11 -05:00
Alex Gleason 645474a77c Merge branch 'accordion' into 'develop' 
Accordions

See merge request soapbox-pub/soapbox-fe!285
 2020-10-01 21:11:52 +00:00
Alex Gleason 7b6276fa59
Accordion: replace ExplanationBox with Accordion 2020-10-01 16:00:50 -05:00
Alex Gleason 63fc0b4e26
Accordion: refactor 2020-10-01 15:19:38 -05:00
Alex Gleason 77da2b0c73
Markdown: style images 2020-10-01 12:07:04 -05:00
Alex Gleason 2631aed374
ProfileHoverCard: fix #425 hide hover card when ref gets detatched 2020-09-30 16:19:52 -05:00
Mary Kate 12bdeac718 updates to Soapbox Config. Remove unnecessary fields, add accordion component 2020-09-30 14:09:00 -05:00
Alex Gleason b9d484623c
Add closed registration message fixes #177 2020-09-29 22:28:42 -05:00
Alex Gleason b782f6ab1a
Snackbar: clean up styles, basic functionality 2020-09-29 18:55:05 -05:00
Sean King 49ad44bcd4 Fix merge conflicts hopefully 2020-09-28 20:31:24 -06:00
Alex Gleason 78b4587ce0
Snackbar: improve style 2020-09-28 18:43:17 -05:00
Alex Gleason 81c31f5d92
Merge remote-tracking branch 'origin/develop' into snackbar 2020-09-28 16:20:28 -05:00
Alex Gleason 532e37a347 Merge branch 'form-aesthetic-improvements' into 'develop' 
Preferences Form aesthetic improvements

See merge request soapbox-pub/soapbox-fe!270
 2020-09-28 16:05:43 +00:00
Mary Kate 061a820ce5 fix language picker dropdown arrow 2020-09-28 10:51:42 -05:00
Alex Gleason 57be8b0e2c
DetailedStatus: display name spacing hotfix 2020-09-28 10:25:12 -05:00
Mary Kate 5b6833060e fix spacing on preferences options 2020-09-28 00:01:36 -05:00
Alex Gleason c597200798
Remove unused CSS, #439 2020-09-27 23:20:15 -05:00
Alex Gleason 57b72840e5
Remove unused CSS, #439 2020-09-27 22:48:21 -05:00
Alex Gleason 3091f20fc9
Halloween: transparent vignette for light theme 2020-09-27 13:33:03 -05:00
Alex Gleason bdd6b608a6
Chats: increase pane height 265-->350px 2020-09-26 22:46:55 -05:00
Sean King 21f68bf623 Merge branch 'develop' into 'icon_picker_admin_config' 
# Conflicts:
#   app/soapbox/features/forms/index.js
#   app/soapbox/features/soapbox_config/index.js
 2020-09-26 19:52:52 +00:00
Alex Gleason 14e10382f2
Halloween mode 2020-09-25 15:39:54 -05:00
Alex Gleason bcc2ee9c70
Chats: fix audio toggle on light theme 2020-09-22 17:02:33 -05:00
Alex Gleason c96c537a52
Chats: clean up menu icon 2020-09-22 17:00:01 -05:00
Alex Gleason 9d2da836b3
Snackbar: allow severity levels 2020-09-21 22:56:15 -05:00
Alex Gleason bf91463284
Chats: add timestamps, fixes #370 2020-09-18 18:55:57 -05:00
Alex Gleason 377506a92f
Chats: allow toggle notification sounds from mobile 2020-09-18 00:28:54 -05:00
Alex Gleason e60457dd01
Chat notifs: shrink toggle 2020-09-17 22:59:23 -05:00
Alex Gleason 57b82f7778
Merge remote-tracking branch 'origin/develop' into chat_notifications 2020-09-17 22:41:18 -05:00
Alex Gleason dbddc177c1
Merge remote-tracking branch 'origin/develop' into fix_safari_sidebar_menu_rendering 2020-09-17 21:51:38 -05:00
Alex Gleason 0c15e3235a
Chats: mobile action button padding hotfix 2020-09-11 20:10:47 -05:00
Alex Gleason d644ed3c55
Chats: remove underline from recipient name on mobile 2020-09-11 19:47:45 -05:00
Alex Gleason bdaab2110b
Chats: improve mobile styles 2020-09-11 19:45:24 -05:00
Alex Gleason c135ccffeb
Chats: fix verification icon in chats list 2020-09-11 16:02:51 -05:00
Alex Gleason 4d5561e9af
Hovercard: invisible hotfix 2020-09-11 15:54:22 -05:00
Alex Gleason 35fe2fa4fa
Hovercard: hide on click ref 2020-09-11 15:39:38 -05:00
Sean King f60ca1aa8f Merge branch 'develop' into 'icon_picker_admin_config' 
# Conflicts:
#   package.json
 2020-09-11 19:27:04 +00:00
Alex Gleason 9ac6f3aaab
Restore old border-radius behavior, fixes #266 2020-09-11 12:24:43 -05:00
Alex Gleason 72659f27c1
Hovercard: attach to each element for better positioning 2020-09-11 12:17:32 -05:00
Alex Gleason 1d90950e59
Hovercard: refactor with HoverRefWrapper 2020-09-11 11:37:05 -05:00
Alex Gleason d8ea37bf5e
Hovercard: clear when card is unhovered 2020-09-10 22:08:17 -05:00
Alex Gleason 4630a5cd04
Hovercard: mouseout clears the card 2020-09-10 20:18:04 -05:00
Alex Gleason 0c4eae5f10
Hovercard: basic Redux+Popper prototype 2020-09-10 19:09:27 -05:00
Sean King 02190fbb0b
Shrink width of font icon picker a slight bit 2020-09-09 16:56:40 -06:00
Sean King 79c4540214
Fix CSS for icon picker in dark theme 2020-09-09 16:47:53 -06:00
Sean King 4166c932a2
Add font icon picker, not yet fixed fatal error 2020-09-08 20:15:25 -06:00
Alex Gleason 255419a6e9
Chats: display attachments in a shitty letterbox to support FireFox 2020-09-07 19:13:59 -05:00
Alex Gleason fdaa9f24ce
Chats: fix position of action icons 2020-09-07 18:51:57 -05:00
Alex Gleason 54a772190d
Chats: fix send icon on light theme 2020-09-07 16:10:45 -05:00
Alex Gleason 9247f37e75
Chats: fix #399 scrolling in FireFox 2020-09-07 16:07:05 -05:00
Alex Gleason 60402a7402
Chats: add submit button, fixes #356 2020-09-06 17:43:16 -05:00
Curtis ROck 9103797de4 improve styling on chats audio toggle 2020-09-06 17:39:38 -05:00
Alex Gleason 024e9209af
Chats: display of non-image attachments 2020-09-06 17:20:26 -05:00
Alex Gleason a02155846d
Chats: allow files to be removed before sending 2020-09-06 17:09:06 -05:00
Curtis ROck ba5cab89aa styling for audio chat notifications 2020-09-06 16:54:45 -05:00
Alex Gleason 49d2121017
Chats: improve display of images, because we can 2020-09-06 16:50:54 -05:00
Alex Gleason 8088ca2748
Merge remote-tracking branch 'origin/develop' into chat-attachments 2020-09-06 16:25:16 -05:00
Alex Gleason cf0baab6de
Chats: add upload progress 2020-09-06 15:39:16 -05:00
Alex Gleason 07f29ebcb9
Chats: put attachment above content 2020-09-06 14:15:06 -05:00
Bárbara de Castro Fernandes 01667a005e Show file icon and name for other file types 
Currently the media preview looks blank when the file type is anything
other than an image, video or audio. This commit inserts a generic file
icon and also a label with the filename for these other extensions.
 2020-09-06 16:08:09 -03:00
Alex Gleason 6dc38adeaa
Chats: add upload button to chat input 2020-09-06 11:55:20 -05:00
Alex Gleason 84e5175481
Chats: improve attachments, make modal work 2020-09-05 16:39:57 -05:00
Alex Gleason d8d5186a01
Chats: basic display of attachments 2020-09-04 20:17:03 -05:00
Alex Gleason c595e393da
Chats: fix pagination bugs, use flex column-reverse 2020-09-04 17:19:26 -05:00
Alex Gleason f89f4e08fe
Theme toggle: use dark bg in tabs-bar again 2020-09-03 23:51:16 -05:00
Sean King 529cb0d417
Fix theme toggle CSS on dark 2020-09-03 17:04:34 -06:00
Alex Gleason 9df386b477
Chats: fix #375 truncated message text 2020-09-03 14:57:58 -05:00
Alex Gleason 35a0cdb64e
Chats: fix chatroom title text color 2020-09-03 13:03:30 -05:00
Alex Gleason 3246812a72
Theme toggle: fix color in sidebar menu light mode 2020-09-03 13:02:26 -05:00
Alex Gleason a98fadb4d4
Show remote favicons on statuses, #258 2020-09-02 21:40:26 -05:00
Alex Gleason eec61b957b
Style links in chats 2020-09-01 00:05:00 -05:00
Alex Gleason 445bb30ac0
Chats: display the last message in chats list, fixes #361 2020-08-30 19:31:09 -05:00
Alex Gleason a47524d33f
User Panel: fix truncated display name 2020-08-30 18:53:37 -05:00
Alex Gleason a419c5da34 Merge branch 'chats' into 'develop' 
ChatMessages MVP

See merge request soapbox-pub/soapbox-fe!185
 2020-08-28 22:03:34 +00:00
Alex Gleason 399c2874bb
Chats: display recipient name in ChatRoom 2020-08-28 16:26:42 -05:00
Alex Gleason a70e82928b
Chats: improve mobile textarea styles 2020-08-28 15:38:38 -05:00
Alex Gleason 229d5c3f90
Chats: add mobile chat notification counter 2020-08-28 15:22:33 -05:00
Alex Gleason 7d0bd47ac1
Chats: update "Message" button with conditional logic for mobile 2020-08-28 15:06:55 -05:00
Alex Gleason 572a1db9f7
Chats: mobile styling 2020-08-28 14:42:58 -05:00
Alex Gleason f83e5ba882
Chats: some mobile styling for rooms 2020-08-28 13:27:40 -05:00
Alex Gleason e7c6862fd0
Chats: refactor ChatBox into its own component 2020-08-28 13:17:19 -05:00
Alex Gleason 4b22726016
Lower .floating-nav-link z-index to be below chat panes 2020-08-27 22:31:43 -05:00
Alex Gleason 8a8953a787
Chats: decrease font size slightly 2020-08-27 19:28:46 -05:00
Alex Gleason e682c3db28
Chats: use textarea instead of input 2020-08-27 19:25:16 -05:00
Alex Gleason abd6c419f1
Chats: hide for mobile (for now) 2020-08-27 16:54:07 -05:00
Alex Gleason 22063ae3c8
Chats: replace avatar with unread counter 2020-08-27 16:41:24 -05:00
Alex Gleason ac028ed584
Chats: add unread counters to chats 2020-08-27 15:43:19 -05:00
Alex Gleason 14eec701cb
Chats: add empty chats message 2020-08-27 14:02:52 -05:00
Alex Gleason d9df091f75
Chats: increase main pane header font size 2020-08-27 13:37:53 -05:00
Alex Gleason c0f6830e7f
Chat: fix avatar proportion in pane header 2020-08-27 13:08:04 -05:00
Alex Gleason 75dc5cfbe2
Chats: speed up pane open animation 2020-08-27 13:04:16 -05:00
Alex Gleason e12b74713a
Chats z-index above account header 2020-08-27 12:55:38 -05:00
Alex Gleason 845c03e8ad
Add scroll bar to chats list 2020-08-27 12:53:44 -05:00
Alex Gleason 59c2029535
Chats: style pending messages 2020-08-27 12:51:35 -05:00
Alex Gleason d0a9c8b47d
Chat z-index behind modals and topbar 2020-08-27 12:45:19 -05:00
Alex Gleason 0e21cf26f4
Chat link style fixes 2020-08-27 00:33:57 -05:00
Alex Gleason 80a78ac0e1
Chats: fix border-radius and chat content height 2020-08-26 11:58:24 -05:00
Alex Gleason a296e6fcd1
Differentiate chat bubbles 2020-08-26 00:21:54 -05:00
Alex Gleason bd7aa14488 Merge branch 'markdown-ordered-lists-fix' into 'develop' 
Fix markdown ordered list numbers rending on the bottom, fixes #344

Closes #344

See merge request soapbox-pub/soapbox-fe!186
 2020-08-26 04:42:33 +00:00
Alex Gleason 5373c5b1c4
Chats: start styling ChatWindow 2020-08-25 21:03:10 -05:00
Alex Gleason 5518959531
Chats: improve input box CSS 2020-08-25 19:19:55 -05:00
Alex Gleason a2cd0b7630
Chats: improve toggle surface area 2020-08-25 19:13:54 -05:00
Alex Gleason c2c3fefbaa
Chats: Improve minimize animation 2020-08-25 18:58:40 -05:00
Alex Gleason 1c6c9f0f5d
Chats: Toggle pane open and minimized 2020-08-25 18:45:05 -05:00
Alex Gleason 072aed02da
Chats: Allow closing a chat 2020-08-25 18:11:48 -05:00
Alex Gleason 0d7a926fa5
Chats: Style the chat boxes 2020-08-25 17:07:07 -05:00
Alex Gleason d6b3268da4
Render chats in panes layout 2020-08-25 14:58:35 -05:00
Mary Kate d74a1908c7 move deactivated profile logic to css 2020-08-25 13:47:36 -05:00
Mary Kate 40f707fcb0 Fix markdown ordered list numbers rending on the bottom, sometimes 2020-08-25 13:02:40 -05:00
Alex Gleason 7693fb87cc
Scaffold chat click 2020-08-25 11:33:51 -05:00
Alex Gleason e35e8f613f
Rudimentary ChatList display 2020-08-24 21:32:39 -05:00
Alex Gleason f1cff927c0
Display Chat list 2020-08-24 21:26:42 -05:00
Alex Gleason e1a86d4e1c
SoapboxConfig: Improve style of delete icons 2020-08-23 23:55:03 -05:00
Alex Gleason 011b80f717
SoapboxConfig: Improve raw JSON editor 2020-08-23 23:46:34 -05:00
Alex Gleason e173af54f1
SoapboxConfig: Raw JSON editor 2020-08-23 23:19:56 -05:00
Alex Gleason 3b808b6a26
SoapboxConfig: .file-picker img max-height 2020-08-23 21:41:53 -05:00
Alex Gleason 91e860a67b
SoapboxConfig: Actually upload the logo and banner files 2020-08-23 21:35:33 -05:00
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