Alex Gleason
|
3d8ce61fe5
|
CHANGELOG: fixed JSON error rendering
|
2021-07-27 08:30:38 -05:00 |
|
Alex Gleason
|
33a19c002a
|
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
|
2021-07-27 08:29:53 -05:00 |
|
Alex Gleason
|
94db0b7cd6
|
Add activity+json to Phoenix :format_encoders
Fixes ErrorView rendering
|
2021-07-27 08:28:52 -05: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 |
|
feld
|
17d79f3484
|
Merge branch 'admin-api-users-date' into 'develop'
AdminAPI: add created_at date to users
See merge request pleroma/pleroma!3482
|
2021-07-14 14:35:21 +00:00 |
|
Alex Gleason
|
117b3edf54
|
CHANGELOG: AdminAPI return date with users
|
2021-07-14 09:03:44 -05: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
|
5681a007d7
|
CHANGELOG: AdminAPI users sort
|
2021-07-13 22:48:32 -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 |
|
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
|
ebcc28fef0
|
Merge branch 'features/validators-apc2s' into 'develop'
AP C2S: Remove restrictions and make it go through pipeline
See merge request pleroma/pleroma!3203
|
2021-07-12 05:01:36 +00:00 |
|
Haelwenn (lanodan) Monnier
|
6dc78f5f6f
|
AP C2S: Remove restrictions and make it go through pipeline
|
2021-07-12 06:49:41 +02:00 |
|
feld
|
aa9a6c3c05
|
Merge branch 'update/linkify' into 'develop'
Update Linkify
See merge request pleroma/pleroma!3478
|
2021-07-08 17:44:52 +00:00 |
|
Mark Felder
|
64d009693e
|
Update Linkify to fix crash on posts with a URL we failed to parse correctly
|
2021-07-08 12:33:17 -05:00 |
|
feld
|
9e1da4bf58
|
Merge branch 'remote-deletions' into 'develop'
Fix user deletion problems
See merge request pleroma/pleroma!3476
|
2021-07-06 20:05:05 +00: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 |
|
Haelwenn
|
5717256eba
|
Merge branch 'fix-2686' into 'develop'
Activity deletion: fix FunctionClauseError, fixes #2686
Closes #2686
See merge request pleroma/pleroma!3475
|
2021-06-25 04:52:19 +00: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
|
f9ae7e72e9
|
Merge branch 'bugfix/upload-limit-plug' into 'develop'
Downgrade Plug to 1.10.x, revert upload_limit tuple to function change
See merge request pleroma/pleroma!3472
|
2021-06-22 23:27:32 +00:00 |
|
feld
|
a814671e85
|
Merge branch 'docs/dependencies-rewrite' into 'develop'
Rewrite docs related to dependencies
See merge request pleroma/pleroma!3466
|
2021-06-22 16:52:19 +00: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 |
|
Haelwenn
|
a8adc300d4
|
Merge branch 'cycles-ci-skip' into 'develop'
Cycles CI: skip unless Elixir code is modified
See merge request pleroma/pleroma!3467
|
2021-06-11 22:25:41 +00:00 |
|
Alex Gleason
|
640e1cf09d
|
Cycles CI: skip unless Elixir code is modified
|
2021-06-11 08:45:19 -05:00 |
|
Haelwenn (lanodan) Monnier
|
822196f393
|
docs/…/opt_en.md: Reuse /main/ repository url for the /community/ repo
|
2021-06-11 08:48:35 +02:00 |
|
Haelwenn (lanodan) Monnier
|
17f980e9ab
|
docs: Remove Erlang Solutions repository
|
2021-06-11 08:48:35 +02:00 |
|
Haelwenn (lanodan) Monnier
|
6b1f7f2f52
|
docs: Use one file to describe dependencies
|
2021-06-11 08:48:35 +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 |
|
feld
|
b84873d3df
|
Merge branch 'cycles-ci' into 'develop'
Prevent compile-time cycles in CI
See merge request pleroma/pleroma!3420
|
2021-06-09 19:04:40 +00:00 |
|
Alex Gleason
|
15e2aaa9f6
|
Fix compile cycle in Pleroma.Tests.AuthTestController
|
2021-06-09 13:30:19 -05:00 |
|
Alex Gleason
|
87cd04fe0c
|
Cycles CI: disable cache
|
2021-06-09 13:12:33 -05:00 |
|
Alex Gleason
|
cefb952dff
|
CI: echo $MIX_ENV
|
2021-06-09 13:08:24 -05:00 |
|
Alex Gleason
|
4bb578a1d7
|
Add cycles test to .gitlab-ci.yml
Thank you @jb55@bitcoinhackers.org for the awk syntax
|
2021-06-09 13:06:01 -05:00 |
|
feld
|
3972d7117e
|
Merge branch 'refactor/ingestion-activity-context' into 'develop'
ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing
See merge request pleroma/pleroma!3462
|
2021-06-09 17:17:41 +00:00 |
|
feld
|
489b8bea9a
|
Merge branch 'eblurhash-hex' into 'develop'
Use eblurhash 1.1.0 from Hex
See merge request pleroma/pleroma!3464
|
2021-06-09 17:08:37 +00:00 |
|
Mark Felder
|
6aa7fc15df
|
Formatting of the comment
|
2021-06-09 11:58:51 -05:00 |
|