fbe5a00475
For pleroma.emoji downloaded packs, generate pack.json instead
5 years ago
3b1bc079af
Merge branch 'exclude-visibilities-for-timelines' into 'develop'
...
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
See merge request pleroma/pleroma!1818
5 years ago
e0da0d4f9e
Merge branch 'backport/develop-branch-hiding-fix' into 'develop'
...
Backport "Fix hiding branch name logic" to develop
See merge request pleroma/pleroma!1846
5 years ago
2f0ed5f6c4
Fix hiding branch name logic
5 years ago
c00797d08e
Merge branch 'fix/version-branch-skip' into 'stable'
...
Fix hiding branch name logic
See merge request pleroma/pleroma!1845
5 years ago
0733da3205
Fix hiding branch name logic
5 years ago
988654a720
Merge branch 'stable-fix-docs' into 'stable'
...
Fix documentation deploy for stable
See merge request pleroma/pleroma!1844
5 years ago
dd859e6847
Fix documentation deploy for stable
5 years ago
442acb31ac
Fix pleroma_ctl link
5 years ago
832d892c2c
Merge branch 'final-release-prep' into 'maint/1.1'
...
Final 1.1 release preparations
See merge request pleroma/pleroma!1843
5 years ago
8ef4afcc3b
Final 1.1 release preparations
5 years ago
13966f1504
Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1'
...
Backport/1.1 branch name change
See merge request pleroma/pleroma!1841
5 years ago
2b6cd10b68
Correct version parser branch name detection
5 years ago
164f42c5f8
Add a changelog entry for branch-moving
5 years ago
bbe409c914
Prepare pleroma_ctl for moving master to stable and relax the error
...
message
5 years ago
3d3c166e59
Preparations for renaming `master` to `stable`
5 years ago
8b39d6f93c
Merge branch 'master-to-stable' into 'develop'
...
Preparations for renaming `master` to `stable`
See merge request pleroma/pleroma!1840
5 years ago
17b8896c40
Correct version parser branch name detection
5 years ago
d1e969842d
Add a changelog entry for branch-moving
5 years ago
58fea88564
Prepare pleroma_ctl for moving master to stable and relax the error
...
message
5 years ago
0e9243e8a2
Preparations for renaming `master` to `stable`
5 years ago
8ad015ef64
Skip deactivated users in followers import
5 years ago
1d46944fbd
Do not add `follower_address` to `following` for non local users
5 years ago
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
e3b4a3e96b
Merge branch 'incoming-id-fixes' into 'develop'
...
Assorted transmogrifier fixes
See merge request pleroma/pleroma!1831
5 years ago
1f99abbeba
Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1'
...
Backport mediaproxy failure tracking enchancements to maint
See merge request pleroma/pleroma!1837
5 years ago
a8afbe977a
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
...
Make MediaProxy failure tracking less brutal
See merge request pleroma/pleroma!1836
(cherry picked from commit 930cbd6d059bdbf081
5 years ago
930cbd6d05
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
...
Make MediaProxy failure tracking less brutal
See merge request pleroma/pleroma!1836
5 years ago
9bdbf0811b
Make MediaProxy failure tracking less brutal
...
The current failure tracking mechanism will never request anything that
didn't respond with a success, 403, 404, or 5xx codes. This is causing
issues when using in real fediverse because of weird status codes
some software has and timeouts being frequent. This patch changes
failure tracking mechanism to only never request the url again if it
responded with 400, 204, or the body is too large, otherwise it can be
re-requested in 60 seconds.
5 years ago
d9410c488a
Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1'
...
Backport pleroma-ctl enchancements to maint
See merge request pleroma/pleroma!1833
5 years ago
751513b6df
This line either causes a warning, or a failed test
5 years ago
cc6875b582
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
5 years ago
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
5 years ago
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
5 years ago
fbbb032bc5
Merge branch 'pleroma-ctl-enchancements' into 'develop'
...
pleroma_ctl: Make it possible to specify branches/flavours when updating
See merge request pleroma/pleroma!1832
(cherry picked from commit 44afe4c887b750135a
5 years ago
44afe4c887
Merge branch 'pleroma-ctl-enchancements' into 'develop'
...
pleroma_ctl: Make it possible to specify branches/flavours when updating
See merge request pleroma/pleroma!1832
5 years ago
422aa6befe
Ostatus DeleteHandler: Fix for new option format.
5 years ago
cb8492962e
SearchController: Fix test.
...
Turns out you can't actually find the user with this.
5 years ago
b750135acd
pleroma_ctl: Make it possible to specify branches/flavours when updating
5 years ago
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
5 years ago
9b963064eb
Transmogrifier: Actually store who deleted a note.
5 years ago
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
5 years ago
fb5dce481c
Fix https://git.pleroma.social/pleroma/pleroma/issues/1289
5 years ago
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
5 years ago
2c7ff32e5b
Add `thread_visibility` to migrations
5 years ago
ecd7ac855b
Benchmark config: Don't use the sql sandbox.
5 years ago
b9b00e6e96
Gitlab CI: Run correct benchmark task.
5 years ago
2629493804
Benchmark config: Database adjustments.
5 years ago
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
5 years ago
Ekaterina Vaartis