sadposter
|
daab1eaa65
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-08-05 13:01:25 +01:00 |
|
Alex Gleason
|
44ede0657f
|
Merge remote-tracking branch 'pleroma/develop' into staff-plug
|
2021-08-04 11:48:57 -05:00 |
|
sadposter
|
2519d4eb1a
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-08-02 22:10:01 +01:00 |
|
Alex Gleason
|
7f23dd6cc8
|
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
|
2021-07-27 08:54:26 -05:00 |
|
Alex Gleason
|
9cc8642b80
|
Visibility: check Tombstone objects in visible_for_user?/2
|
2021-07-27 08:54:01 -05:00 |
|
sadposter
|
de69585eaa
|
:Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-07-23 09:57:26 +01:00 |
|
Haelwenn
|
7acdab1f30
|
Merge branch 'mkljczk-develop-patch-60115' into 'develop'
MastodonAPI: Fix list timelines
Closes mastofe#89 and #2693
See merge request pleroma/pleroma!3477
|
2021-07-22 18:41:11 +00:00 |
|
feld
|
3f58213646
|
Merge branch 'admin-api-users-sort' into 'develop'
AdminAPI: sort new users at the top
Closes #2709
See merge request pleroma/pleroma!3481
|
2021-07-14 14:39:14 +00:00 |
|
Alex Gleason
|
1a2fe96d56
|
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
|
2021-07-14 09:02:55 -05:00 |
|
Alex Gleason
|
167e14416b
|
AdminAPI: add date to users
|
2021-07-14 08:54:59 -05:00 |
|
Alex Gleason
|
deb3f91136
|
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
|
2021-07-13 22:47:47 -05:00 |
|
Alex Gleason
|
5e88796784
|
AdminAPI: sort user results by ID descending
|
2021-07-13 22:47:02 -05:00 |
|
Alex Gleason
|
1f093cb216
|
Moderators: reorganize :admin_api pipeline in Router
|
2021-07-12 22:11:32 -05:00 |
|
Alex Gleason
|
9bc1e79c56
|
Moderators: add UserIsStaffPlug
|
2021-07-12 21:57:52 -05:00 |
|
Haelwenn
|
173e977e28
|
Merge branch 'features/ingestion-page' into 'develop'
Pipeline Ingestion: Page
See merge request pleroma/pleroma!3097
|
2021-07-12 05:05:49 +00:00 |
|
Haelwenn (lanodan) Monnier
|
6dc78f5f6f
|
AP C2S: Remove restrictions and make it go through pipeline
|
2021-07-12 06:49:41 +02:00 |
|
marcin mikołajczak
|
6ef8e1776d
|
fix the fucking list timelines on mastofe/soapbox-fe
|
2021-07-02 13:03:41 +00:00 |
|
Alex Gleason
|
310ef6b70d
|
Deletions: change User.purge/1 to defp, add CHANGELOG entry
|
2021-06-30 12:25:20 -05:00 |
|
Alex Gleason
|
99cc26bb02
|
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
|
2021-06-30 02:02:30 -05:00 |
|
Alex Gleason
|
beb1c98ab5
|
Deletions: don't purge keys so Delete/Undo activities can be signed
|
2021-06-30 02:02:24 -05:00 |
|
Alex Gleason
|
43800d83f4
|
Deletions: allow deactivated users to be deleted
|
2021-06-30 01:32:28 -05:00 |
|
Alex Gleason
|
a7929c4d89
|
Deletions: preserve account status fields during purge, fix checks
|
2021-06-29 23:56:19 -05:00 |
|
Alex Gleason
|
01c2d2a296
|
Also purge the user in User.perform/2
|
2021-06-29 22:53:33 -05:00 |
|
Alex Gleason
|
c6d4133727
|
Deletions: purge the user immediately
|
2021-06-29 22:30:48 -05:00 |
|
Alex Gleason
|
be2da95c36
|
Correctly purge a remote user
|
2021-06-29 21:45:38 -05:00 |
|
sadposter
|
f191021f52
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-06-27 22:31:42 +01:00 |
|
sadposter
|
e56c319e8f
|
merge
|
2021-06-27 22:31:37 +01:00 |
|
Alex Gleason
|
281806de75
|
Activity deletion: fix FunctionClauseError #2686
|
2021-06-24 21:03:31 -05:00 |
|
feld
|
f97f305d00
|
Merge branch 'ecto-upgrade' into 'develop'
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
See merge request pleroma/pleroma!3473
|
2021-06-23 20:17:01 +00:00 |
|
Alex Gleason
|
54af527759
|
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
|
2021-06-23 13:22:32 -05:00 |
|
Haelwenn (lanodan) Monnier
|
fc6ab78a84
|
Add test on changing [:instance, :upload_limit]
|
2021-06-22 12:25:25 +02:00 |
|
Haelwenn (lanodan) Monnier
|
a851a24036
|
Downgrade Plug to 1.10.x, revert upload_limit tuple to function change
This should fix setting the upload limit in the database as found in:
https://queer.hacktivis.me/notice/A8XUZp74Cg7eYNEMxU
This reverts commit 7d350b73f5 .
|
2021-06-22 11:19:13 +02:00 |
|
feld
|
406dadb56b
|
Merge branch 'fix/twittercard-video-dimensions' into 'develop'
Generate Twittercard/OGP metadata with correct dimensions
See merge request pleroma/pleroma!3456
|
2021-06-10 15:03:58 +00:00 |
|
Mark Felder
|
202ee5fd77
|
Add note about video thumbnails for code spelunkers unfamiliar with Media Preview Proxy
|
2021-06-10 09:56:43 -05:00 |
|
Alex Gleason
|
15e2aaa9f6
|
Fix compile cycle in Pleroma.Tests.AuthTestController
|
2021-06-09 13:30:19 -05:00 |
|
Mark Felder
|
6aa7fc15df
|
Formatting of the comment
|
2021-06-09 11:58:51 -05:00 |
|
Mark Felder
|
5f7901cc48
|
Credo
|
2021-06-09 11:09:14 -05:00 |
|
Mark Felder
|
2a47156b87
|
Lint
|
2021-06-09 11:06:53 -05:00 |
|
Mark Felder
|
86bcb87e6c
|
Fix incorrectly ordered arguments to the function and not properly merging lists.
|
2021-06-09 11:05:24 -05:00 |
|
Mark Felder
|
2cf648d419
|
Add a video thumbnail to the OpenGraph metadata if Media Preview Proxy is enabled.
|
2021-06-09 10:02:41 -05:00 |
|
Mark Felder
|
19a49dd757
|
Remove Metadata.Utils.attachment_url/1
This was a wasteful shortcut to MediaProxy.preview_url/1 and we don't
always want the preview_url in the metadata anyway.
|
2021-06-09 09:58:29 -05:00 |
|
Haelwenn (lanodan) Monnier
|
c839078a75
|
ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing
|
2021-06-09 04:23:02 +02:00 |
|
Haelwenn
|
53cf801c30
|
Merge branch 'cycles-plug-deps' into 'develop'
Refactor skipped plugs into Pleroma.Web functions
See merge request pleroma/pleroma!3463
|
2021-06-09 02:20:00 +00:00 |
|
Haelwenn
|
eba3c7b42f
|
Merge branch 'cycles-side-effects' into 'develop'
Recompilation speedup: Switch to runtime deps in ActivityPub.SideEffects
See merge request pleroma/pleroma!3460
|
2021-06-09 01:54:38 +00:00 |
|
Alex Gleason
|
45b7325b9e
|
Refactor skipped plugs into Pleroma.Web functions
Speeds up recompilation by reducing compile cycles
|
2021-06-08 19:15:04 -05:00 |
|
Alex Gleason
|
67ec0e6c18
|
Switch to runtime deps in ActivityPub.SideEffects
Speeds up recompilation by reducing compile cycles
|
2021-06-08 18:18:25 -05:00 |
|
Alex Gleason
|
45ab24f2d9
|
Switch to runtime deps in Pleroma.Instances
Speeds up recompilation by limiting compile cycles
|
2021-06-08 18:03:34 -05:00 |
|
Mark Felder
|
9cb8960284
|
Switch OGP default type from "website" to "article"
This is what Mastodon uses and might fix some link preview bugs I've encountered
|
2021-06-08 17:14:30 -05:00 |
|
feld
|
d896e45faf
|
Merge branch 'cycles-config-loader-redux' into 'develop'
Recompilation speedup: Ignore runtime deps in Pleroma.Config.Loader with Module.concat/1
See merge request pleroma/pleroma!3458
|
2021-06-08 22:08:37 +00:00 |
|
feld
|
4de2bd3b79
|
Merge branch 'cycles-user-view' into 'develop'
Recompilation speedup: Create AdminAPI.UserView to avoid compile-time dep
See merge request pleroma/pleroma!3457
|
2021-06-08 22:07:25 +00:00 |
|