rinpatch
17b8896c40
Correct version parser branch name detection
5 years ago
rinpatch
d1e969842d
Add a changelog entry for branch-moving
5 years ago
rinpatch
58fea88564
Prepare pleroma_ctl for moving master to stable and relax the error
...
message
5 years ago
rinpatch
0e9243e8a2
Preparations for renaming `master` to `stable`
5 years ago
eugenijm
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
lain
e3b4a3e96b
Merge branch 'incoming-id-fixes' into 'develop'
...
Assorted transmogrifier fixes
See merge request pleroma/pleroma!1831
5 years ago
rinpatch
930cbd6d05
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
...
Make MediaProxy failure tracking less brutal
See merge request pleroma/pleroma!1836
5 years ago
rinpatch
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
Maxim Filippov
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
5 years ago
Maxim Filippov
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
5 years ago
Haelwenn
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
lain
422aa6befe
Ostatus DeleteHandler: Fix for new option format.
5 years ago
lain
cb8492962e
SearchController: Fix test.
...
Turns out you can't actually find the user with this.
5 years ago
rinpatch
b750135acd
pleroma_ctl: Make it possible to specify branches/flavours when updating
5 years ago
lain
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
5 years ago
lain
9b963064eb
Transmogrifier: Actually store who deleted a note.
5 years ago
Maxim Filippov
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
5 years ago
lain
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
5 years ago
lain
ecd7ac855b
Benchmark config: Don't use the sql sandbox.
5 years ago
lain
b9b00e6e96
Gitlab CI: Run correct benchmark task.
5 years ago
lain
2629493804
Benchmark config: Database adjustments.
5 years ago
lain
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
5 years ago
lain
02f8e2a8ab
Gitlab: Run benchmark in CI.
5 years ago
kaniini
9fd5176c35
Merge branch 'unicode-search' into 'develop'
...
Search: Add tests for unicode searches.
See merge request pleroma/pleroma!1824
5 years ago
kaniini
c9b3f0151b
Merge branch 'webfinger-mocks' into 'develop'
...
provide mocks for webfinger endpoints
See merge request pleroma/pleroma!1821
5 years ago
Steven Fuchs
dc6d20b68d
provide mocks for webfinger endpoints
5 years ago
lain
1357ec1a10
Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
...
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`
See merge request pleroma/pleroma!1822
5 years ago
lain
f64dfd317f
Merge branch 'feature/count-statuses-task' into 'develop'
...
Add a task to re-count statuses for all users
Closes #1305
See merge request pleroma/pleroma!1823
5 years ago
Maxim Filippov
ad42837244
Ability to toggle activation status and permission group for a group of users
5 years ago
lain
c1bae01376
Search: Add tests for unicode searches.
5 years ago
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users
5 years ago
eugenijm
580a67f5ca
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
rinpatch
6355694309
Merge branch 'chore/format-migrations' into 'develop'
...
Enable `mix format` for migrations
See merge request pleroma/pleroma!1819
5 years ago
rinpatch
32808208be
Enable `mix format` for migrations
5 years ago
rinpatch
44e0c5cabb
Merge branch 'chore/bump-fe-122323f3' into 'develop'
...
Bump pleroma-fe bundle to 122323f35c
See merge request pleroma/pleroma!1817
5 years ago
rinpatch
a502155274
Bump pleroma-fe bundle to 122323f35c
5 years ago
kaniini
380c67e2c3
Merge branch 'bugfix/exclude-replies' into 'develop'
...
mastodon api: fix exclude_replies (closes #1287 )
Closes #1287
See merge request pleroma/pleroma!1813
5 years ago
Ariadne Conill
9a2f71f4d5
mastodon api: fix exclude_replies ( closes #1287 )
5 years ago
kaniini
0a99f1e8c5
Merge branch 'feature/move-rss-out-of-ostatus' into 'develop'
...
Extract RSS Feed functionality from OStatus
Closes #1243
See merge request pleroma/pleroma!1644
5 years ago
Sergey Suprunenko
4b3f77a99f
Extract RSS Feed functionality from OStatus
5 years ago
kaniini
5c32e6ee91
Merge branch 'chore/context-cleanups' into 'develop'
...
clean up bundled litepub schema (closes #1303 )
Closes #1303
See merge request pleroma/pleroma!1808
5 years ago
Ariadne Conill
19962d2022
clean up bundled litepub schema ( closes #1303 )
5 years ago
kaniini
93bdc55306
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
...
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
5 years ago
Haelwenn
15592f1abe
Merge branch '1260-rate-limited-auth-actions' into 'develop'
...
[#1260 ] Rate-limiting for create authentication and related requests
Closes #1260
See merge request pleroma/pleroma!1681
5 years ago
Ivan Tashkinov
28fb98d69e
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
Haelwenn
b4f3c16885
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
...
[#1234 ] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
5 years ago
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject
5 years ago
kaniini
25cffffaf1
Merge branch 'fix/bad-migration' into 'develop'
...
Fix muted notification migration only working with a schema
See merge request pleroma/pleroma!1803
5 years ago
rinpatch
ee88afb2e2
Fix muted notification migration only working with a schema
...
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
5 years ago
kaniini
2411d09215
Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
...
Move local keys out of `user.info`
See merge request pleroma/pleroma!1799
5 years ago