Alex Gleason
|
489792e1f3
|
Merge branch 'ptr-fix' into 'develop'
Remove PullToRefresh from ScrollableList, wrap outer components instead
See merge request soapbox-pub/soapbox-fe!1633
|
2022-07-14 18:10:43 +00:00 |
|
Alex Gleason
|
6f55dfaf67
|
Merge branch 'develop' into 'develop'
Fixed grammar
See merge request soapbox-pub/soapbox-fe!1635
|
2022-07-14 18:10:01 +00:00 |
|
Alex Gleason
|
4b94bc8b5d
|
Merge remote-tracking branch 'origin/develop' into ptr-fix
|
2022-07-14 13:01:18 -05:00 |
|
Jason Hollis
|
4925e17d0c
|
Fixed grammar
|
2022-07-14 12:56:50 -04:00 |
|
marcin mikołajczak
|
0c13ecf10f
|
Merge branch 'ts-notifications' into 'develop'
Notifications: TS
See merge request soapbox-pub/soapbox-fe!1628
|
2022-07-14 05:42:09 +00:00 |
|
marcin mikołajczak
|
2d5454a93f
|
Merge branch 'ts' into 'develop'
TypeScript, React.FC
See merge request soapbox-pub/soapbox-fe!1592
|
2022-07-14 05:41:41 +00:00 |
|
Alex Gleason
|
f4f34cf585
|
Remove PullToRefresh from ScrollableList, wrap outer components instead
|
2022-07-13 20:13:37 -05:00 |
|
marcin mikołajczak
|
8566fad06f
|
Merge branch 'language-pl' into 'develop'
Update Polish translation
See merge request soapbox-pub/soapbox-fe!1631
|
2022-07-13 22:06:26 +00:00 |
|
|
|
849d82d620
|
Update Polish translation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-13 23:59:27 +02:00 |
|
Alex Gleason
|
576be5030f
|
Merge branch 'virtuoso-v2.16.2' into 'develop'
Upgrade react-virtuoso to v2.16.2
See merge request soapbox-pub/soapbox-fe!1626
|
2022-07-13 21:59:11 +00:00 |
|
|
|
3e6dc0cfe7
|
PinnedStatuses: TS, FC
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-13 21:03:45 +02:00 |
|
|
|
479386af03
|
Merge remote-tracking branch 'soapbox/develop' into ts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-13 20:57:12 +02:00 |
|
|
|
d527425f67
|
Update notification.test.tsx
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-12 00:25:07 +02:00 |
|
|
|
37d97eb857
|
Notifications: TS
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-11 23:27:43 +02:00 |
|
marcin mikołajczak
|
ffe14d9aa7
|
Merge branch 'notifications-empty-messages' into 'develop'
Show different 'empty notifications' message if category is selected
See merge request soapbox-pub/soapbox-fe!1627
|
2022-07-11 20:20:44 +00:00 |
|
|
|
c9edf20ab7
|
Show different 'empty notifications' message if category is selected
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-11 20:10:14 +02:00 |
|
marcin mikołajczak
|
30bf4a04b3
|
Merge branch 'styles-' into 'develop'
Federation restrictions page styles
See merge request soapbox-pub/soapbox-fe!1622
|
2022-07-11 17:53:47 +00:00 |
|
Alex Gleason
|
efa19a9230
|
Upgrade react-virtuoso to v2.16.2
|
2022-07-11 12:18:26 -05:00 |
|
Alex Gleason
|
70cd4148e6
|
Merge branch 'subscription-button-no-tooltip' into 'develop'
SubscriptionButton: remove tooltip warning about web push
See merge request soapbox-pub/soapbox-fe!1618
|
2022-07-11 17:15:03 +00:00 |
|
Justin
|
818db57f8e
|
Merge branch 'fix-empty-carousel' into 'develop'
Hide carousel if no avatars
Closes #1029
See merge request soapbox-pub/soapbox-fe!1624
|
2022-07-11 15:05:46 +00:00 |
|
Justin
|
96e47962c9
|
Hide carousel if no avatars
|
2022-07-11 09:10:10 -04:00 |
|
Justin
|
1254f8a3f3
|
Merge branch 'feed-suggestions' into 'develop'
Feed suggestions
See merge request soapbox-pub/soapbox-fe!1595
|
2022-07-11 13:00:41 +00:00 |
|
|
|
604ad37c11
|
Federation restrictions page styles
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-11 00:02:08 +02:00 |
|
Alex Gleason
|
cb26a515a2
|
Fix suggestions test types
|
2022-07-09 15:08:01 -05:00 |
|
Alex Gleason
|
3874d1d9ef
|
Merge remote-tracking branch 'origin/develop' into feed-suggestions
|
2022-07-09 15:02:45 -05:00 |
|
Alex Gleason
|
f42973b00e
|
Merge branch 'subscription-fixes' into 'develop'
Subscription / Notifications fixes
See merge request soapbox-pub/soapbox-fe!1620
|
2022-07-09 19:58:41 +00:00 |
|
Alex Gleason
|
ef6510f03b
|
Merge remote-tracking branch 'origin/develop' into subscription-fixes
|
2022-07-09 14:46:47 -05:00 |
|
Alex Gleason
|
7d953b906f
|
Merge branch 'tabler-v1.73.0' into 'develop'
Upgrade Tabler to v1.73.0, use new import paths, remove Webpack hack, upgrade Jest to v28
See merge request soapbox-pub/soapbox-fe!1621
|
2022-07-09 19:43:39 +00:00 |
|
Alex Gleason
|
8bcf5fe82d
|
Update tests for Jest v28, apply uuid hack
https://github.com/uuidjs/uuid/pull/616#issuecomment-1111012599
|
2022-07-09 14:25:19 -05:00 |
|
Alex Gleason
|
0dc9478600
|
Jest: simplify regexes
|
2022-07-09 14:08:46 -05:00 |
|
Alex Gleason
|
022474718b
|
Merge remote-tracking branch 'origin/upgrade-jest' into tabler-v1.73.0
|
2022-07-09 14:03:02 -05:00 |
|
Alex Gleason
|
16c08b23a8
|
Fix improper import of Tabler icons
|
2022-07-09 11:22:38 -05:00 |
|
Alex Gleason
|
6ddb44f626
|
Upgrade Tabler to v1.73.0, use new import paths, remove Webpack hack
|
2022-07-09 11:20:02 -05:00 |
|
marcin mikołajczak
|
59cc913083
|
Merge branch 'video-meta' into 'develop'
Ensure attachment meta is not null
See merge request soapbox-pub/soapbox-fe!1619
|
2022-07-09 07:21:49 +00:00 |
|
Alex Gleason
|
018117049e
|
Update icons in notifications filter bar
|
2022-07-08 18:33:10 -05:00 |
|
Alex Gleason
|
f66d65924a
|
Better enforcement of notification types
|
2022-07-08 18:09:57 -05:00 |
|
Alex Gleason
|
627e6c574f
|
Drop invalid notifications
|
2022-07-08 17:52:39 -05:00 |
|
Alex Gleason
|
463c9fc9f5
|
Please the linter gods
|
2022-07-08 17:49:30 -05:00 |
|
Alex Gleason
|
b10dc7ea6e
|
Notification: fix ariaLabel crash
|
2022-07-08 17:20:41 -05:00 |
|
|
|
8be4bb7409
|
Ensure attachment meta is not null
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-09 00:15:26 +02:00 |
|
Alex Gleason
|
48bd46cf92
|
Web push locales: add pleroma locales
|
2022-07-08 17:08:41 -05:00 |
|
Alex Gleason
|
143aa119d2
|
notification.chat_mention --> notification.pleroma:chat_mention
|
2022-07-08 17:07:38 -05:00 |
|
Alex Gleason
|
94cbffc194
|
Add missing web push locales
|
2022-07-08 17:05:19 -05:00 |
|
Alex Gleason
|
44d0a75044
|
SubscriptionButton: remove tooltip warning about web push
|
2022-07-08 16:54:23 -05:00 |
|
Alex Gleason
|
79b11fefde
|
Merge branch 'login-fail-throw' into 'develop'
logIn: rethrow 403 for non-waitlisted account
See merge request soapbox-pub/soapbox-fe!1617
|
2022-07-08 20:16:50 +00:00 |
|
Alex Gleason
|
1b373fae97
|
Fix registration test
|
2022-07-08 15:08:24 -05:00 |
|
Alex Gleason
|
da9eaf2b82
|
verifyCredentials: do alert on failure
|
2022-07-08 14:48:06 -05:00 |
|
Alex Gleason
|
3fbc912dae
|
logIn: rethrow 403 for non-waitlisted account
|
2022-07-08 14:38:36 -05:00 |
|
Alex Gleason
|
ef6608341f
|
Merge branch 'login-header-fix' into 'develop'
Public layout header: fix weird error where the header can disappear
See merge request soapbox-pub/soapbox-fe!1616
|
2022-07-08 19:04:54 +00:00 |
|
Alex Gleason
|
f37f4b9e6e
|
Public layout header: fix weird error where the header can disappear
|
2022-07-08 13:50:38 -05:00 |
|
