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 |
|
rinpatch
|
125f96e706
|
Fix the use of queries with a schema in a migration
|
5 years ago |
|
feld
|
09a3b993fe
|
Merge branch 'fix/report-email' into 'develop'
Fix/report email
Closes #1300
See merge request pleroma/pleroma!1800
|
5 years ago |
|
feld
|
1d8e956c32
|
Use the user.id instead of nickname in report URLs
Ensures links to profiles of remote users work.
|
5 years ago |
|
Ivan Tashkinov
|
b93856874d
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
5 years ago |
|
rinpatch
|
fefbd31c6e
|
Move local keys out of `user.info`
|
5 years ago |
|
Ivan Tashkinov
|
06b3bb54c5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
5 years ago |
|
Ivan Tashkinov
|
f459aabdfa
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Haelwenn
|
9e34919dcd
|
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
|
5 years ago |
|
kaniini
|
7a318d74e6
|
Merge branch 'split-masto-api/leftovers' into 'develop'
[#1278] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
|
5 years ago |
|
kaniini
|
45b7f03f89
|
Merge branch 'accept-embedded-announce-object' into 'develop'
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
|
5 years ago |
|
kaniini
|
17ff4b43cb
|
Merge branch 'unread-conversation-count' into 'develop'
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
|
5 years ago |
|
eugenijm
|
8249924485
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
|
kaniini
|
0ee6100c8d
|
Merge branch 'update-activity-fixes' into 'develop'
Update activity fixes
Closes #1298
See merge request pleroma/pleroma!1795
|
5 years ago |
