bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15161 commits 1 branch 0 tags 292 MiB
Commit graph

9073 commits

Author SHA1 Message Date
marcin mikołajczak
8221504ecb Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-10-12 21:52:36 +02:00
Alex Gleason
0447197378 Merge branch 'merge-pleroma' into 'develop' 
Merge Pleroma

See merge request soapbox-pub/rebased!184
 2022-10-10 01:22:54 +00:00
Alex Gleason
0ee413400f
FEP-e232: support Link mediaType "application/activity+json" 2022-10-09 15:25:34 -05:00
Alex Gleason
ddaeb09e54
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2022-10-09 13:46:48 -05:00
Alex Gleason
11dfc2589a
Add support for FEP-e232 quotes without quoteUrl 2022-10-09 13:27:16 -05:00
Tusooa Zhu
dd82fd234f
Merge branch 'release/2.4.4' into mergeback/2.4.4 2022-10-08 22:15:09 -04:00
marcin mikołajczak
678b6ce17c Add more tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-06 00:06:34 +02:00
marcin mikołajczak
e187aff5dd Add some tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-03 23:10:02 +02:00
marcin mikołajczak
c45612badd Update spec, fix tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-03 20:13:44 +02:00
marcin mikołajczak
73e7549d94 Update scheduled notitfications on edit 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-02 16:32:34 +02:00
Alex Gleason
0cd15c997c
TagValidator: allow Link tags, don't go nuclear for unrecognized Tag types 2022-10-01 19:56:11 -05:00
marcin mikołajczak
0612c32c6e Add notifications for updates in events you joined 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-01 22:26:35 +02:00
marcin mikołajczak
9ff0eb5c4b Fix event updates 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-10-01 18:01:52 +02:00
marcin mikołajczak
58e0ca0d68 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-09-30 20:04:29 +02:00
Alex Gleason
544be36c80
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2022-09-28 17:29:53 -05:00
marcin mikołajczak
c6fddd6e0a Add migration cooldown period 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-28 23:48:45 +02:00
Haelwenn
3f1c31b7cd Merge branch 'fix/exclude-deactivated-in-search' into 'develop' 
User: search: exclude inactive users from user search

See merge request pleroma/pleroma!3755
 2022-09-27 23:58:45 +00:00
marcin mikołajczak
f7d9f42243 event editing? 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-27 23:56:20 +02:00
Haelwenn
5d7d623390 Merge branch 'bugfix/elixir-1.14' into 'develop' 
Bugfix: Elixir 1.14

See merge request pleroma/pleroma!3740
 2022-09-27 21:46:03 +00:00
marcin mikołajczak
daccdc179c Only allow event author to accept/reject joins 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-27 21:01:48 +02:00
marcin mikołajczak
31d2f9a255 Store internal location data 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-25 23:19:08 +02:00
marcin mikołajczak
ba9fe4c6f2 Fix participation requests query 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-25 22:01:34 +02:00
marcin mikołajczak
5039c5ca80 Fix notification display 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-24 22:04:44 +02:00
marcin mikołajczak
f5fe5b4544 Add shortcuts and share_target to manifest.json 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-24 18:34:09 +02:00
marcin mikołajczak
0b65d205c9 Store participation_request_count 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-22 23:42:28 +02:00
marcin mikołajczak
c3f59eb9ec format 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-18 13:14:11 +02:00
tusooa
1a7107f4a5 Merge branch 'remove_from_followers' into 'develop' 
MastoAPI: POST /api/v1/accounts/:id/remove_from_followers

See merge request pleroma/pleroma!3647
 2022-09-16 23:24:13 +00:00
marcin mikołajczak
3b498061ed Merge remote-tracking branch 'rebased/develop' into pleroma-events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-16 21:24:22 +02:00
a1batross
7f63b4c315 User: search: exclude deactivated users from user search 
This way we don't pollute search results with deactivated and deleted users
 2022-09-16 00:49:16 +03:00
Tusooa Zhu
ea60c4e709
Fix wrong relationship direction 2022-09-14 20:24:04 -04:00
Alex Gleason
f5e77a3eaa
soapbox-fe --> soapbox 2022-09-13 15:26:28 -05:00
Hélène
0b19625bfb
ObjectView: do not fetch an object for its ID 
Non-Create/Listen activities had their associated object field
normalized and fetched, but only to use their `id` field, which is both
slow and redundant. This also failed on Undo activities, which delete
the associated object/activity in database.

Undo activities will now render properly and database loads should
improve ever so slightly.
 2022-09-11 04:54:04 +02:00
marcin mikołajczak
98ccf6cbdc Merge branch 'webfinger-expanding' into 'develop' 
Webfinger expanding

See merge request soapbox-pub/rebased!96
 2022-09-10 22:03:10 +00:00
marcin mikołajczak
f169b9ee3b Use paths from mastodon groups implementation 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-07 15:03:57 +02:00
Alex Gleason
ce9bacc3be Merge branch 'fix-subscriptions' into 'develop' 
Create notifications async with NotificationWorker, #91

See merge request soapbox-pub/rebased!173
 2022-09-06 16:33:02 +00:00
marcin mikołajczak
86cb1897f5 Fixes, add/update tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 23:34:25 +02:00
Alex Gleason
05a20c8d6d
Create notifications async with NotificationWorker, #91 2022-09-05 12:38:30 -05:00
marcin mikołajczak
a84d9b78f6 Display location, mix format 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 18:24:37 +02:00
Haelwenn
b8d6cb5845 Merge branch 'from/upstream-develop/tusooa/2892-backup-scope' into 'develop' 
Make backups require its own scope

Closes #2892

See merge request pleroma/pleroma!3721
 2022-09-05 15:42:02 +00:00
Haelwenn
346c130ddc Merge branch 'fix/user-private-key-generation' into 'develop' 
User: generate private keys on user creation

See merge request pleroma/pleroma!3737
 2022-09-05 15:38:15 +00:00
tusooa
f7c2073103 Merge branch 'bump/min-elixir-1.10' into 'develop' 
Bump minimum Elixir version to 1.10

See merge request pleroma/pleroma!3741
 2022-09-05 15:19:34 +00:00
tusooa
9874b4c985 Merge branch 'develop' into 'from/upstream-develop/tusooa/2892-backup-scope' 
# Conflicts:
#   CHANGELOG.md
 2022-09-05 15:00:19 +00:00
marcin mikołajczak
d4eccd86b3 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 15:30:14 +02:00
marcin mikołajczak
f1607c3d3b Add geospatial package dependency 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-09-05 13:53:13 +02:00
Hélène
cd237d22f1
User: generate private keys on user creation 
This fixes a race condition bug where keys could be regenerated
post-federation, causing activities and HTTP signatures from an user to
be dropped due to key differences.
 2022-09-05 03:51:17 +02:00
tusooa
f8afba95b2 Merge branch 'fix/gts-federation' into 'develop' 
GoToSocial federation fixes

See merge request pleroma/pleroma!3725
 2022-09-05 01:10:34 +00:00
tusooa
20347898e2 Merge branch 'fix/federation-context-issues' into 'develop' 
Fix reply context fixing (Pleroma replies to Misskey threads) and removal of context objects

See merge request pleroma/pleroma!3717
 2022-09-04 18:43:36 +00:00
Haelwenn
c63cf954de Merge branch 'from/upstream-develop/tusooa/streaming-fix' into 'develop' 
Streaming fix

Closes #2796

See merge request pleroma/pleroma!3738
 2022-09-03 18:24:28 +00:00
Hélène
4477c6baff
Metadata/Utils: use summary as description if set 
When generating OpenGraph and TwitterCard metadata for a post, the
summary field will be used first if it is set to generate the post
description.
 2022-09-03 17:17:48 +02:00
marcin mikołajczak
cdf454bfd2 Merge remote-tracking branch 'pleroma/develop' into HEAD 2022-09-03 17:04:02 +02:00