Commit graph

704 commits

Author SHA1 Message Date
c78495900e Merge remote-tracking branch 'origin/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-17 22:53:06 +01:00
lain
752bc168f6 Merge branch 'quotes-count' into 'develop'
Count and display post quotes

See merge request pleroma/pleroma!3956
2023-11-12 13:38:09 +00:00
marcin mikołajczak
9a063deacc Count and display post quotes 2023-11-12 13:38:08 +00:00
Mark Felder
bf426c53b4 Fix digest email processing, consolidate Oban queues
The email related jobs can all share a single Oban queue
2023-11-07 15:14:36 -05:00
83054ebd5e Replace deprecated Logger.warn/1 with Logger.warning
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-08-10 23:29:35 +02:00
f1592b2947 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-07-26 22:32:27 +02:00
Haelwenn
043a00991d Merge branch 'instance-nodeinfo-metadata' into 'develop'
instances: Store some metadata based on NodeInfo

See merge request pleroma/pleroma!3853
2023-06-27 18:58:04 +00:00
Haelwenn
41f2ee69a8 Merge branch 'from/upstream-develop/tusooa/backup-status' into 'develop'
Detail backup states

Closes #3024

See merge request pleroma/pleroma!3809
2023-06-27 12:08:11 +00:00
Lain Soykaf
22878cf84a B Migrations: Don't remove activity_visibility_index for now. 2023-06-11 16:22:16 +04:00
Lain Soykaf
175ee9e6fe Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unused_indexes 2023-06-11 16:20:30 +04:00
Haelwenn (lanodan) Monnier
fcd49e3985 User: Remove ap_enabled field 2023-05-05 11:11:26 +02:00
Mark Felder
d91a823836 Remove unused indexes
These indexes were always listed as unused and several grow quite large.
The most significant impact is the activities_visibility_index which takes many hours to rebuild when restoring the server from backup even on fast hardware.
2023-04-22 16:43:33 +00:00
Haelwenn (lanodan) Monnier
9a2523a09a instances: Store some metadata based on NodeInfo 2023-03-16 09:02:20 +01:00
marcin mikołajczak
c6c724cea1 Merge branch 'merge-pleroma' into 'develop'
merge pleroma

See merge request soapbox-pub/rebased!229
2023-02-04 22:39:35 +00:00
marcin mikołajczak
9e3468c833 Merge branch 'develop' into 'internal-webhooks'
# Conflicts:
#   lib/pleroma/webhook.ex
2023-01-11 09:58:50 +00:00
lain
e853cfe7c3 Revert "Merge branch 'copyright-bump' into 'develop'"
This reverts merge request !3825
2023-01-02 20:38:50 +00:00
10886eeaa2 Bump copyright year
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-01 12:13:06 +01:00
tusooa
e4ac2a7cd6
Detail backup states 2022-12-24 00:04:32 -05:00
7ee63904ec Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-22 19:20:52 +01:00
Lain Soykaf
63d00f8123 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps 2022-12-15 17:19:36 -05:00
Alex Gleason
9a091a8d85
Add events index 2022-12-07 18:01:42 -06:00
2e7a713e58 Merge remote-tracking branch 'soapbox/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-16 00:06:25 +01:00
b7879d58f3 Merge remote-tracking branch 'pleroma/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-15 23:27:58 +01:00
Mark Felder
8a3b450397 Add migration to remove Quack from ConfigDB 2022-11-11 12:36:34 -05:00
8661703c16 Merge remote-tracking branch 'soapbox/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-09 17:08:18 +01:00
Alex Gleason
39d7093ff5
Remove Shout feature 2022-11-03 13:29:52 -05:00
Mark Felder
7c64f705f6 Update to Phoenix 1.6 and chase dependencies
Also bump minimum Elixir to 1.11
2022-11-03 16:13:07 +00:00
1b9b03b494 Add internal (not managable from API) webhooks
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-29 22:20:05 +02:00
8221504ecb Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-10-12 21:52:36 +02:00
Alex Gleason
035d9e71eb
Merge remote-tracking branch 'origin/develop' into merge-pleroma 2022-10-09 13:58:19 -05:00
4d9ecc2b9e Fix down() in AddUpdateToNotificationsEnum migration for Rebased
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-06 00:11:25 +02:00
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
58e0ca0d68 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-09-30 20:04:29 +02:00
Alex Gleason
f6afe649fe
GenerateUnsetUserKeys: only select necessary user fields 2022-09-28 17:58:25 -05:00
Alex Gleason
544be36c80
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2022-09-28 17:29:53 -05:00
c6fddd6e0a Add migration cooldown period
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-28 23:48:45 +02:00
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
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
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
Hélène
cfb1bc967f
Migrations: generate unset user keys
User keys are now generated on user creation instead of "when needed",
to prevent race conditions in federation and a few other issues. This
migration will generate keys missing for local users.
2022-09-05 03:51:35 +02: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
cdf454bfd2 Merge remote-tracking branch 'pleroma/develop' into HEAD 2022-09-03 17:04:02 +02:00
Haelwenn
299255b9bb Merge branch 'from/upstream-develop/tusooa/assoc-object-id' into 'develop'
Add function to calculate associated object id

Closes #2307

See merge request pleroma/pleroma!3692
2022-09-03 02:50:40 +00:00
Haelwenn
e40c221c31 Merge branch 'from/upstream-develop/tusooa/edits' into 'develop'
Editing

Closes #1429, #2859, and #2288

See merge request pleroma/pleroma!3678
2022-09-03 02:16:42 +00:00
2aae16d810 Event reminder notifications
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-22 22:47:55 +02:00
c4dea542cc fix migration
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-21 12:46:53 +02:00
Tusooa Zhu
f047088a93
Update thread visibility function 2022-08-20 21:06:12 -04:00
Tusooa Zhu
4e7ed563c0
Lint 2022-08-20 20:43:47 -04:00
Tusooa Zhu
3885ee182a
Switch to associated_object_id index 2022-08-20 20:43:46 -04:00
Tusooa Zhu
06678fb4ad
Add function to calculate associated object id 2022-08-20 20:43:40 -04:00