Commit graph

10821 commits

Author SHA1 Message Date
5ba66f79ba Revert 4c31cf2b
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-28 12:06:38 +02:00
marcin mikołajczak
25350969fd Merge branch 'dropdown-menu-links' into 'main'
Prefer to/href for DropdownMenuItems

See merge request soapbox-pub/soapbox!3007
2024-04-28 09:43:45 +00:00
fd65f7f71e Prefer to/href for DropdownMenuItems
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-28 11:32:56 +02:00
Alex Gleason
0b2e370705 Merge branch 'update-ts' into 'main'
Upgrade TypeScript to v5.4.5

See merge request soapbox-pub/soapbox!3006
2024-04-26 23:04:52 +00:00
Alex Gleason
d7b9cb3e67
Upgrade TypeScript to v5.4.5 2024-04-26 17:36:22 -05:00
Alex Gleason
4df1fbe29b Merge branch 'nip46-param' into 'main'
NIP-46: stringify event object in accordance with updated spec

See merge request soapbox-pub/soapbox!3004
2024-04-26 03:03:43 +00:00
Alex Gleason
22586004e8
NIP-46: stringify event object in accordance with updated spec 2024-04-25 21:47:13 -05:00
marcin mikołajczak
d6b5fb8fe7 Merge branch 'mastodon-badges' into 'main'
Fix role badges for Pleroma

Closes #1654

See merge request soapbox-pub/soapbox!3001
2024-04-24 15:41:08 +00:00
aace58ccb4 Fix role badges for Pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-24 17:02:55 +02:00
Alex Gleason
b47b1666e7 Merge branch 'announcement-sort' into 'main'
useAnnouncements: avoid toSorted

See merge request soapbox-pub/soapbox!3000
2024-04-23 23:34:38 +00:00
Alex Gleason
5f838b5e52
useAnnouncements: avoid toSorted 2024-04-23 18:05:51 -05:00
9a5f2bbc77 Merge expandSpoilers and displayMedia into a single option
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-21 22:07:50 +02:00
a5ab595446 Update en.json
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-21 19:10:06 +02:00
5f98175a32 Improve sensitive content logic, remove 'status under review'
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-21 19:07:14 +02:00
marcin mikołajczak
b8093ace04 Merge branch 'black-mode' into 'main'
Black theme: set counter ring color

See merge request soapbox-pub/soapbox!2998
2024-04-18 22:10:54 +00:00
1b73a1fbc3 Black theme: set counter ring color
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-18 23:51:04 +02:00
Alex Gleason
87d04e6a0c Merge branch 'fix-badge-crash' into 'main'
Badge: fix page crash when color isn't defined

Closes #1650

See merge request soapbox-pub/soapbox!2996
2024-04-16 20:53:29 +00:00
Alex Gleason
b86da5f426
Badge: fix page crash when color isn't defined
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1650
2024-04-16 15:35:50 -05:00
marcin mikołajczak
1518615767 Merge branch 'mastodon-badges' into 'main'
Support role badges on Mastodon

See merge request soapbox-pub/soapbox!2985
2024-04-16 10:49:48 +00:00
marcin mikołajczak
fa34fa3652 Merge branch 'announcements' into 'main'
Use react-query and zod for announcements

See merge request soapbox-pub/soapbox!2990
2024-04-15 20:39:35 +00:00
marcin mikołajczak
5f515524f8 Merge branch 'persist-instance' into 'main'
Fix instance persistence in indexeddb

See merge request soapbox-pub/soapbox!2991
2024-04-15 20:29:12 +00:00
marcin mikołajczak
6918768f55 Merge branch 'bookmark-folders' into 'main'
Allow to change folder for an existing bookmark

See merge request soapbox-pub/soapbox!2995
2024-04-15 08:39:38 +00:00
f90a1618d2 Allow to change folder for an existing bookmark
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-13 13:25:37 +02:00
Alex Gleason
e181296596 Merge branch 'rm-docs' into 'main'
Remove docs, point to docs.soapbox.pub

See merge request soapbox-pub/soapbox!2994
2024-04-12 02:27:02 +00:00
Alex Gleason
ccdc4b9ed8
README: update docs links 2024-04-11 20:44:44 -05:00
Alex Gleason
a3c4c7646a
Remove docs, point to docs.soapbox.pub 2024-04-11 20:42:47 -05:00
Alex Gleason
c0849e7250 Merge branch 'patrickReiis-main-patch-65904' into 'main'
docs: fix cd command in running instructions

See merge request soapbox-pub/soapbox!2993
2024-04-11 21:12:27 +00:00
P. Reis
22d527478a docs: fix cd command 2024-04-11 21:05:28 +00:00
7a8b473406 Fix instance persistence in indexeddb
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-10 00:03:18 +02:00
10db5c264d Merge remote-tracking branch 'origin/main' into announcements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-09 23:41:53 +02:00
161db37ba0 Use react-query and zod for announcements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-09 23:38:09 +02:00
marcin mikołajczak
9b63adc23f Merge branch 'dashboard' into 'main'
Extend dashboard, use hooks more

See merge request soapbox-pub/soapbox!2989
2024-04-08 16:46:24 +00:00
4dec7a4111 yarn i18n
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-07 12:06:42 +02:00
890975fe93 Dashboard: hooks cleanup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-07 12:03:10 +02:00
9375f1f117 Allow managing instance rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-07 11:07:32 +02:00
b36b636493 Merge remote-tracking branch 'origin/main' into dashboard
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-07 10:02:10 +02:00
771c9643dc Switch admin log to react-query
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-07 09:52:54 +02:00
f06ec3469b Merge remote-tracking branch 'origin/main' into dashboard
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-07 09:14:33 +02:00
Alex Gleason
d4beb15d71 Merge branch 'nip19-routes' into 'main'
NIP-19 routes

See merge request soapbox-pub/soapbox!2988
2024-04-07 02:45:49 +00:00
Alex Gleason
199f534892
Redirect NIP-19 IDs 2024-04-06 20:50:10 -05:00
Alex Gleason
00aa373997
useEntityLookup: fix lookup redirect 2024-04-06 20:45:54 -05:00
Alex Gleason
2c9bdf03a4
StatusActionBar: get external domain from status.uri instead of fqn 2024-04-06 19:39:41 -05:00
marcin mikołajczak
5176d8b23e Merge branch 'mastodon-rule-hints' into 'main'
Support Mastodon rule hints

See merge request soapbox-pub/soapbox!2987
2024-04-06 07:52:31 +00:00
f69d1d95e4 Support Mastodon rule hints
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-06 09:36:18 +02:00
e3a87a0326 Support role badges on Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-05 17:12:12 +02:00
marcin mikołajczak
93e9760274 Merge branch 'feature-media-reordering' into 'main'
Add ability to reorder uploaded media before posting in web UI

See merge request soapbox-pub/soapbox!2984
2024-04-05 13:49:18 +00:00
3a27967846 Add ability to reorder uploaded media before posting in web UI
Based on Gargron's changes in Mastodon: https://github.com/mastodon/mastodon/pull/28456

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-05 14:00:15 +02:00
marcin mikołajczak
35620a7330 Merge branch 'missing-alt-description' into 'main'
Add optional indicator for attachments without description

See merge request soapbox-pub/soapbox!2982
2024-04-04 09:24:17 +00:00
8ef1de5f7a Merge remote-tracking branch 'origin/main' into missing-description-confirmation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-04 11:05:04 +02:00
d3c0604599 Add optional indicator for attachments without description
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-04 11:02:15 +02:00