Commit graph

947 commits

Author SHA1 Message Date
b6f4897450 Merge remote-tracking branch 'soapbox/develop' into lexical 2023-05-22 16:51:34 +02:00
Alex Gleason
cdd0fd63b2 Merge branch 'nip07' into 'develop'
Implement NIP-07

See merge request soapbox-pub/soapbox!2513
2023-05-21 02:34:42 +00:00
Alex Gleason
f318c35544
Simplify event signing 2023-05-20 21:15:53 -05:00
NEETzsche
2709153c20 api/pleroma/admin --> api/v1/pleroma/admin 2023-05-19 16:18:26 -07:00
oakes
98f5450a9e Add missing import 2023-05-18 12:53:32 -04:00
oakes
f4da2006ef Pass baseURL when revoking oauth token 2023-05-18 12:39:59 -04:00
65db6f503d Merge remote-tracking branch 'soapbox/develop' into lexical 2023-05-16 22:14:22 +02:00
Alex Gleason
e5837ebefb
nip07: catch signEvent error 2023-05-13 21:25:59 -05:00
Alex Gleason
85f526d1d4
Sign Nostr event with ditto 2023-05-13 21:07:36 -05:00
Alex Gleason
a5c616312f
Merge remote-tracking branch 'origin/develop' into nostr-ws 2023-05-13 19:27:52 -05:00
41e969616d Forgot to commit some files
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-05-11 22:10:58 +02:00
da6be7ba4c Merge remote-tracking branch 'soapbox/develop' into follow-hashtags 2023-05-11 19:31:25 +02:00
Alex Gleason
0f65c7bd7e
Auth: fix otherAccounts throwing a fullscreen error in local dev 2023-05-08 10:35:12 -05:00
e703cd5059 Merge remote-tracking branch 'soapbox/develop' into lexical
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-05-07 22:54:04 +02:00
Chewbacca
670b3cff02 Merge branch 'remove-groups-search' into 'develop'
Remove group search inside global search

See merge request soapbox-pub/soapbox!2499
2023-05-05 17:15:27 +00:00
Chewbacca
390855b6d9 Merge branch 'allow-owner-status-deletion' into 'develop'
Add ability for owners to delete statuses from Group

See merge request soapbox-pub/soapbox!2490
2023-05-05 17:15:08 +00:00
Chewbacca
8ebaca0b44 Remove group search inside global search 2023-05-04 09:48:39 -04:00
Chewbacca
4bc92f3c27 Add ability for owners to delete statuses from Group 2023-05-03 08:31:43 -04:00
Alex Gleason
ece5ba4764
Merge remote-tracking branch 'origin/develop' into zod-card 2023-05-02 19:36:00 -05:00
Alex Gleason
0016aeacec
Normalize Relationship with zod 2023-05-02 18:49:13 -05:00
Alex Gleason
54d8d12054
Remove normalizeAd 2023-05-02 18:30:21 -05:00
5aaf4d75af Merge remote-tracking branch 'soapbox/develop' into follow-hashtags
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-05-02 23:32:43 +02:00
Alex Gleason
626ddfda80
Truncate long usernames in modals 2023-05-02 13:28:42 -05:00
9a29412267 Merge remote-tracking branch 'soapbox/develop' into lexical
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-05-01 22:08:02 +02:00
Alex Gleason
f9b5954060
ComposeModal: allow passing a composeId 2023-04-26 15:07:19 -05:00
Chewbacca
ed4b86c5fa Add page to show statuses per tag 2023-04-21 09:36:37 -04:00
3d433c6a75 Merge remote-tracking branch 'soapbox/develop' into lexical 2023-04-16 19:05:21 +02:00
Chewbacca
5612cb6fdf Merge branch 'fix-reply-status-group' into 'develop'
Fix replying to status from Group

See merge request soapbox-pub/soapbox!2426
2023-04-12 19:05:42 +00:00
Chewbacca
39f2734bd4 Fix replying to status from Group 2023-04-10 15:59:36 -04:00
Alex Gleason
c2348a6249
Merge remote-tracking branch 'origin/develop' into home-link-headers 2023-04-10 10:13:19 -05:00
33d8ad1774 Merge remote-tracking branch 'soapbox/develop' into lexical 2023-04-04 22:34:16 +02:00
Alex Gleason
9d0ff2b8a4
Remove group-editor code 2023-04-03 15:10:33 -05:00
Alex Gleason
659c186394
ManageGroupModal: use internal state instead of Redux 2023-04-03 15:06:20 -05:00
Alex Gleason
86a5753d10
Sign nostr event from websocket 2023-04-02 20:50:48 -05:00
Alex Gleason
2bc6ff3fa3
Use Link header for home timeline pagination 2023-04-02 18:32:50 -05:00
9c49fc3d8a Lexical: Hashtag, emoji autocompletion
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-04-02 20:50:15 +02:00
46ffd053bb Merge remote-tracking branch 'soapbox/develop' into lexical
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-04-02 12:03:35 +02:00
Alex Gleason
5720d396fc
Groups: make "share with followers" button work 2023-03-30 20:47:08 -05:00
820ead9932 Merge remote-tracking branch 'soapbox/develop' into lexical 2023-03-30 18:17:23 +02:00
marcin mikołajczak
55c0f8d6a1 Merge branch 'friendica' into 'develop'
Friendica dislikes

See merge request soapbox-pub/soapbox!2381
2023-03-28 22:13:24 +00:00
6b2109735d Merge remote-tracking branch 'soapbox/develop' into lexical
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-28 14:35:49 +02:00
Alex Gleason
d39e2cc7e0
UnapprovedAccount: use countdown, remove rejectUserModal 2023-03-27 17:14:22 -05:00
c953da7c78 Merge remote-tracking branch 'soapbox/develop' into lexical 2023-03-27 20:04:26 +02:00
12f3b4fbc3 Support Friendica dislikes, quotes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-25 23:16:40 +01:00
96a8bcdf82 Friendica dislikes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-03-25 12:14:53 +01:00
Chewbacca
30ef70440f Add ability to report a Group 2023-03-23 15:17:44 -04:00
dadaadcdde Merge remote-tracking branch 'soapbox/develop' into lexical 2023-03-23 15:09:22 +01:00
Alex Gleason
28a69ad88b
Ensure group_visibility param is passed when creating group 2023-03-20 15:30:13 -05:00
Alex Gleason
bc457b61d1 Merge branch 'edit-group' into 'develop'
Edit group

See merge request soapbox-pub/soapbox!2357
2023-03-20 18:41:52 +00:00
5b55a89826 Merge remote-tracking branch 'soapbox/develop' into lexical 2023-03-19 19:39:21 +01:00