Commit graph

5376 commits

Author SHA1 Message Date
76cf741bf8 DeleteAccount: Do not show explanation related to federation if not federating
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-21 08:43:07 +02:00
10bdd664b0 split functions for admin api actions
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-21 08:35:33 +02:00
308877ab7b Use setRef in notifications list
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-21 07:55:51 +02:00
Alex Gleason
dfcde45735 Merge branch 'nginx-t' into 'develop'
GitLab CI: test Mastodon Nginx conf

See merge request soapbox-pub/soapbox-fe!1438
2022-05-21 00:07:30 +00:00
Alex Gleason
0587c3f245
GitLab CI: test Mastodon Nginx conf 2022-05-20 18:48:39 -05:00
Alex Gleason
40c3793d20
Notifications: use a ScrollableList again 2022-05-20 17:18:10 -05:00
Alex Gleason
c729f30efa Merge branch 'loading-screen' into 'develop'
Refactor SoapboxMount

See merge request soapbox-pub/soapbox-fe!1436
2022-05-20 21:20:20 +00:00
marcin mikołajczak
f90f76ae02 Merge branch 'hotkey-nav' into 'develop'
Fix hotkey navigation?

See merge request soapbox-pub/soapbox-fe!1409
2022-05-20 21:17:34 +00:00
marcin mikołajczak
3698c5a026 Merge branch 'familiar-followers' into 'develop'
Display familiar followers on Mastodon

See merge request soapbox-pub/soapbox-fe!1378
2022-05-20 19:25:56 +00:00
2ec9cacb27 Merge remote-tracking branch 'soapbox/develop' into familiar-followers
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-20 21:06:10 +02:00
beef2de673 Merge remote-tracking branch 'soapbox/develop' into hotkey-nav
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-20 21:00:42 +02:00
marcin mikołajczak
21be58ecb4 Merge branch 'remove-from-followers' into 'develop'
Add 'Remove from followers'

See merge request soapbox-pub/soapbox-fe!1408
2022-05-20 18:58:36 +00:00
marcin mikołajczak
28c7a87913 Merge branch 'formatted-lists' into 'develop'
Use FormattedList for 'Replying to'

See merge request soapbox-pub/soapbox-fe!1396
2022-05-20 18:58:34 +00:00
960dd0ed89 Merge remote-tracking branch 'soapbox/develop' into familiar-followers
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-20 20:57:14 +02:00
3cd8a4b966 Use useFeatures hook
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-20 20:54:24 +02:00
Alex Gleason
4e8a3cdce5
SoapboxMount: load WaitlistPage async 2022-05-20 13:29:17 -05:00
Alex Gleason
f0ba5a5a8c
SoapboxMount: load onboarding flow async, refactor 2022-05-20 13:13:17 -05:00
Alex Gleason
e298115fcf
SoapboxMount: async import NotificationsContainer, ModalContainer, remove them elsewhere 2022-05-20 13:00:38 -05:00
Alex Gleason
8354447047
SoapboxMount: refactor render to be DRY 2022-05-20 12:51:57 -05:00
Alex Gleason
f72ee6aad0
SoapboxMount: add comments 2022-05-20 12:30:29 -05:00
Alex Gleason
4cddf0c962
SoapboxMount: create showOnboarding variable 2022-05-20 12:28:59 -05:00
Alex Gleason
84b04250ac
Add LoadingScreen for fullscreen, theme-specific loading 2022-05-20 12:20:31 -05:00
Alex Gleason
5f951b34ee Merge branch 'landing-modal-text' into 'develop'
LandingPageModal: use Text component

See merge request soapbox-pub/soapbox-fe!1434
2022-05-20 15:37:01 +00:00
Alex Gleason
f0cab57ae8 Merge branch 'whitescreen' into 'develop'
SoapboxMount: display a spinner while API requests are loading

Closes #967

See merge request soapbox-pub/soapbox-fe!1424
2022-05-20 15:22:10 +00:00
Alex Gleason
da68610ee1 Merge branch 'verifications-silent' into 'develop'
checkEmailAvailability: fail silently

See merge request soapbox-pub/soapbox-fe!1433
2022-05-20 15:19:55 +00:00
Alex Gleason
f3f6a15686
LandingPageModal: use Text component 2022-05-20 10:15:47 -05:00
Alex Gleason
bd6ce38e5d
checkEmailAvailability: fail silently 2022-05-20 09:58:59 -05:00
Alex Gleason
0a1457c26b Merge branch 'suggestions-set' into 'develop'
Suggestions: store as OrderedSet

See merge request soapbox-pub/soapbox-fe!1432
2022-05-20 01:35:27 +00:00
Alex Gleason
d296811851
Suggestions: store as OrderedSet 2022-05-19 20:16:11 -05:00
Alex Gleason
1fb9525635
Merge remote-tracking branch 'origin/develop' into scroll-position 2022-05-19 20:09:56 -05:00
Alex Gleason
533c356d60
ScrollableList: preserve index rather than scrollTop 2022-05-19 20:03:52 -05:00
Alex Gleason
c3ef55613d Merge branch 'infinite-scroll-suggestions' into 'develop'
Add infinite scroll to suggestions onboarding

See merge request soapbox-pub/soapbox-fe!1430
2022-05-19 21:18:49 +00:00
Alex Gleason
ba0b4851f6
ScrollableList: save and restore scroll position 2022-05-19 16:09:22 -05:00
Alex Gleason
c749738e4b Merge branch 'tombstone-fix' into 'develop'
Fix Tombstone margins in threads, fixes #971

Closes #971

See merge request soapbox-pub/soapbox-fe!1431
2022-05-19 18:03:27 +00:00
Alex Gleason
362f7520ae
Fix Tombstone margins in threads, fixes #971 2022-05-19 12:42:01 -05:00
Alex Gleason
cee7e3761f
Fix suggestions test 2022-05-19 12:31:16 -05:00
Alex Gleason
3fbe810406
Crom, I have never prayed to you before. I have no tongue for it. 2022-05-19 11:52:36 -05:00
Justin
c6c65a0d48 Add infinite scroll to suggestions onboarding 2022-05-19 12:29:28 -04:00
marcin mikołajczak
01e89f51a2 Merge branch 'import-export-ts' into 'develop'
Convert import/export data to TypeScript, use FileInput component

See merge request soapbox-pub/soapbox-fe!1428
2022-05-19 15:42:02 +00:00
86c17682e9 forms can't be disabled, actually
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-19 16:46:32 +02:00
marcin mikołajczak
4044a61716 Merge branch 'aliases-styles' into 'develop'
Search styles on aliases page

See merge request soapbox-pub/soapbox-fe!1429
2022-05-19 14:45:48 +00:00
dd4df89f22 Search styles on aliases page
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-19 15:32:30 +02:00
48290ab540 Convert import/export data to TypeScript, use FileInput component
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-19 15:24:17 +02:00
marcin mikołajczak
0fd073bb00 Merge branch 'hotkey-modal' into 'develop'
Do not show follow requests hotkey if feature not available

See merge request soapbox-pub/soapbox-fe!1427
2022-05-19 11:23:12 +00:00
b19863a471 Change Polish strings for hotkeys modal
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-19 13:03:23 +02:00
0aede77a52 Do not show follow requests hotkey if not feature not available
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-19 12:57:21 +02:00
Alex Gleason
cdad326f6a Merge branch 'review' into 'develop'
Support review apps

See merge request soapbox-pub/soapbox-fe!1425
2022-05-19 03:39:04 +00:00
Alex Gleason
2bfded10d6
Support review apps 2022-05-18 21:49:41 -05:00
Alex Gleason
93187c8eed
SoapboxMount: display a spinner while API requests are loading 2022-05-18 14:38:49 -05:00
Alex Gleason
9248051846 Merge branch 'favourite-import-skip' into 'develop'
Don't import status from favourite

See merge request soapbox-pub/soapbox-fe!1423
2022-05-18 19:25:04 +00:00