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 |
|
Alex Gleason
|
8f532b1b92
|
Media gallery: Fix upload limit, hotfix for #150
|
2020-06-07 14:40:54 -05:00 |
|
Alex Gleason
|
35d5e7d649
|
SecurityForm: Revoke OAuth token
|
2020-06-05 15:54:09 -05:00 |
|
Alex Gleason
|
db1ad3e16f
|
SecurityForm: Display OAuth tokens
|
2020-06-05 15:43:03 -05:00 |
|
Alex Gleason
|
8fd5a3cd35
|
Consolidate actions/security.js --> actions/auth.js
|
2020-06-05 15:27:31 -05:00 |
|
Alex Gleason
|
da44a769d6
|
Get ChangePasswordForm working
|
2020-06-05 15:14:27 -05:00 |
|
Alex Gleason
|
91d511c4b9
|
SecurityForm: Respond to submit
|
2020-06-05 14:45:00 -05:00 |
|
Alex Gleason
|
1076788add
|
Security: Form confirmations
|
2020-06-05 14:39:27 -05:00 |
|
Alex Gleason
|
860b2d18f4
|
Security: Rudimentary email change
|
2020-06-05 14:25:26 -05:00 |
|
Alex Gleason
|
9e20452692
|
Streaming: load messages async
|
2020-06-04 21:28:19 -05:00 |
|
Alex Gleason
|
8b181c38f3
|
Fix i18n streaming.js
|
2020-06-04 19:43:53 -05:00 |
|
Alex Gleason
|
f0528e9d43
|
Better locale detection
|
2020-06-04 17:29:00 -05:00 |
|
Alex Gleason
|
8f566b70e6
|
Better actions names for INSTANCE_FETCH_SUCCESS etc
|
2020-06-03 14:26:22 -05:00 |
|
Alex Gleason
|
d21db82247
|
Remove theming cruft
|
2020-06-02 15:48:27 -05:00 |
|
Alex Gleason
|
c4a2a86618
|
Theme mode set in Preferences
|
2020-06-02 12:16:26 -05:00 |
|
Alex Gleason
|
3fc5d7a83c
|
Get theme from soapbox.json
|
2020-06-01 00:49:43 -05:00 |
|
Alex Gleason
|
86d585ffbd
|
Merge branch 'master' into themes
|
2020-05-31 13:51:45 -05:00 |
|
Alex Gleason
|
a2c9aeb8dd
|
Conditionally fetch /nodeinfo/2.1.json for Pleroma < 2.1, #137
|
2020-05-31 12:01:21 -05:00 |
|
Alex Gleason
|
2c0ee3f29d
|
generateTheme function, refactor
|
2020-05-31 00:21:41 -05:00 |
|
Alex Gleason
|
67a7adb9a9
|
Action to set theme, render theme CSS
|
2020-05-30 19:05:01 -05:00 |
|
Bárbara de Castro Fernandes
|
775f923708
|
Add 'block user' option to the report window
|
2020-05-29 15:05:24 -03:00 |
|
Alex Gleason
|
30384cbfef
|
Clean up auth code
|
2020-05-29 09:55:38 -05:00 |
|
Curtis
|
dbee88f795
|
Update auth.js to fix #97 login failure
|
2020-05-29 02:17:38 +00:00 |
|
Alex Gleason
|
183c6538ca
|
Pull displayMedia from Redux store
|
2020-05-28 20:36:39 -05:00 |
|
Alex Gleason
|
d24dcb3e60
|
gabsocial --> soapbox paths
|
2020-05-28 17:56:55 -05:00 |
|