Commit graph

74 commits

Author SHA1 Message Date
Alex Gleason
5a9f17ebac
Start refactoring AdminAPI actions 2020-08-23 12:48:45 -05:00
Alex Gleason
2cdf6f7275
Merge remote-tracking branch 'origin/develop' into admin_cfg 2020-08-23 12:16:52 -05:00
Alex Gleason
3da44d60bf
Revert direct_timeline to use /api/v1/timelines/direct, fixes #325 2020-08-15 23:37:50 -05:00
Mary Kate
bafe8bd428 show statuses on muted profiles, fixes #301 2020-08-14 20:34:19 -05:00
Alex Gleason
fdbe981477
Fix timeline queue header when filters are enabled 2020-08-14 16:01:30 -05:00
Alex Gleason
bd65a1b3f5
Filter out reposts in local timeline by default, fixes #307 2020-08-14 12:42:03 -05:00
Alex Gleason
e7bd011495
Streaming: Add locale fallback for invalid locale 2020-08-13 04:20:35 -05: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
Mary Kate
ae608388a0 add DM filter option for Home timeline, fixes #254 2020-08-07 20:47:04 -05:00
Mary Kate
e116745e83 timeline filtering improvements 2020-08-07 19:28:30 -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
marykatefain
68f765da28 Multi-Factor Auth with OTP 2020-08-07 20:17:13 +00:00
Mary Kate
69184ef97c add and remove muted words, filters 2020-08-04 21:15:16 -05:00
crockwave
ba18c3a643 SB settings Save works and brandcolor renders. Logo/banner paths are issues, and adding new homefooter/customCSS are issues 2020-08-01 16:38:29 -05:00
crockwave
c6f3816f77 Drafted pushing soapbox object to Redux store on SOAPBOX_POST_SUCCESS 2020-07-30 19:39:41 -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
Mary Kate
209f826c15 add reason field on registration when by approval mode is on 2020-07-28 21:43:27 -05:00
crockwave
7d41967cad corrected editing error in features/edit_profile. edited getFormdata to start producing a JSON data format. Changed actions/soapbox to use post instead of patch 2020-07-28 19:29:20 -05:00
Alex Gleason
1329ca3578
Merge remote-tracking branch 'origin/develop' into add-images-to-polls 2020-07-28 14:18:30 -05:00
Mary Kate
a3201605b4 add uploads to polls 2020-07-28 14:15:15 -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
Curtis ROck
58481d2e07 added patch functions to actions/soapbox. edited features/configuration to support patchSoapbox method. Data not properly formattted yet. 2020-07-27 22:30:53 -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
crockwave
ac17b79253 debugged non-existent soapbox elements and missing soapbox.json. Debugged element state changes. Modified labels and translations. 2020-07-25 18:27:39 -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
Alex Gleason
03e33df86b
Improve domain unblock compatibility, fixes #422 2020-07-16 13:43:25 -05:00
Alex Gleason
44e882d7fc
Show donor badge 2020-07-04 21:25:43 -05:00
Alex Gleason
0dc085411c
Refactor Patron code 2020-07-04 14:14:36 -05:00
Alex Gleason
2d194d75aa
Patron: Expect proxied endpoints 2020-07-01 15:08:18 -05:00
Alex Gleason
73b275b8da
Patron updates 2020-06-30 17:33:21 -05:00
crockwave
08b783c050 correct lint error 2020-06-28 11:14:52 -05:00
crockwave
a21589d9ce translations 2020-06-28 11:09:03 -05:00
crockwave
a2bd359c76 - debugged features/security
- added deactivateAccount method to actions/auth
- successful deactivation logs user out
2020-06-28 10:51:55 -05:00
Alex Gleason
4720ccc57d
Use distinct ME_PATCH_SUCCESS action for responding to account updates 2020-06-16 17:36:49 -05:00
Alex Gleason
d3b31c8bcf
About page: restore functionality, fix tests 2020-06-12 14:39:56 -05:00
Alex Gleason
6d6dbd9113
Test: Start creating component snapshots 2020-06-09 21:29:50 -05:00
Curtis
76b620a802 Update soapbox.js to log soapbox.json parsing errors to the console. Fixes #171
Removed unnecessary semicolon at end of file
2020-06-09 23:53:35 +00:00
Alex Gleason
9fa7f7bf0f
Tests: Start auth actions 2020-06-09 18:29:55 -05:00
Alex Gleason
23039c353e
Tests: DRY mockStore() 2020-06-09 17:28:32 -05:00
Alex Gleason
628d73eb81
Tests: actions/about.js 2020-06-09 17:22:35 -05:00
Alex Gleason
f71f7e4dbd
Tests: Clear API mocks between each test 2020-06-09 17:16:22 -05:00
Alex Gleason
842f35ebc5
Tests: Allow stubbing API 2020-06-09 17:07:27 -05:00
Alex Gleason
6810f8d0b6
Tests: Start mocking API for action tests 2020-06-09 16:47:41 -05:00
Alex Gleason
289f90dd4e
Fix PropType errors 2020-06-07 17:18:26 -05:00
Alex Gleason
d295368170
RegistrationForm: Handle email confirmation, fixes #137 2020-06-07 17:11:14 -05:00
Alex Gleason
4737dc6da9
Compose: Fix NSFW tag error on CW 2020-06-07 15:30:21 -05:00