summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-11Merge branch 'develop' into feature/multiple-users-activation-permissionsMaxim Filippov
2019-10-11Deprecate POST/DELETE ↵Maxim Filippov
/api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
2019-10-11Merge branch 'pleroma-ctl-enchancements' into 'develop'Haelwenn
pleroma_ctl: Make it possible to specify branches/flavours when updating See merge request pleroma/pleroma!1832
2019-10-11Ostatus DeleteHandler: Fix for new option format.lain
2019-10-11SearchController: Fix test.lain
Turns out you can't actually find the user with this.
2019-10-11pleroma_ctl: Make it possible to specify branches/flavours when updatingrinpatch
2019-10-11Transmogrifier: Correctly save incoming ids for Accept/Reject.lain
2019-10-11Transmogrifier: Actually store who deleted a note.lain
2019-10-11Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of ↵Maxim Filippov
deleting it
2019-10-10Fix https://git.pleroma.social/pleroma/pleroma/issues/1289yalh76
2019-10-11Replace `user.following` with Pleroma.FollowingRelationshipEgor Kislitsyn
2019-10-10Transmogrifier: Save correct ids for incoming deletes.lain
2019-10-10Add `thread_visibility` to migrationsEgor Kislitsyn
2019-10-10Benchmark config: Don't use the sql sandbox.lain
2019-10-10Gitlab CI: Run correct benchmark task.lain
2019-10-10Benchmark config: Database adjustments.lain
2019-10-10Merge remote-tracking branch 'origin/develop' into benchmark-finishinglain
2019-10-10Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-10-10Gitlab: Run benchmark in CI.lain
2019-10-10Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-10-09Merge branch 'unicode-search' into 'develop'kaniini
Search: Add tests for unicode searches. See merge request pleroma/pleroma!1824
2019-10-09Merge branch 'webfinger-mocks' into 'develop'kaniini
provide mocks for webfinger endpoints See merge request pleroma/pleroma!1821
2019-10-09provide mocks for webfinger endpointsSteven Fuchs
2019-10-09Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'lain
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id` See merge request pleroma/pleroma!1822
2019-10-09Merge branch 'feature/count-statuses-task' into 'develop'lain
Add a task to re-count statuses for all users Closes #1305 See merge request pleroma/pleroma!1823
2019-10-09Ability to toggle activation status and permission group for a group of usersMaxim Filippov
2019-10-09Search: Add tests for unicode searches.lain
2019-10-09Add a task to re-count statuses for all usersEgor Kislitsyn
2019-10-09Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status ↵eugenijm
(`GET /api/v1/statuses/:id`)
2019-10-08Split CreateFollowingRelationships to multiple migrationsEgor Kislitsyn
2019-10-08Update CreateFollowingRelationshipsEgor Kislitsyn
2019-10-08Merge branch 'chore/format-migrations' into 'develop'rinpatch
Enable `mix format` for migrations See merge request pleroma/pleroma!1819
2019-10-08Enable `mix format` for migrationsrinpatch
2019-10-08Add CreateFollowingRelationships migrationEgor Kislitsyn
2019-10-07Merge branch 'chore/bump-fe-122323f3' into 'develop'rinpatch
Bump pleroma-fe bundle to https://git.pleroma.social/pleroma/pleroma-fe/commit/122323f35c32a4f12a345a8b3f163e9318f5dea3 See merge request pleroma/pleroma!1817
2019-10-07Bump pleroma-fe bundle to ↵rinpatch
https://git.pleroma.social/pleroma/pleroma-fe/commit/122323f35c32a4f12a345a8b3f163e9318f5dea3
2019-10-07Line is too long!Maxim Filippov
2019-10-07Merge branch 'bugfix/exclude-replies' into 'develop'kaniini
mastodon api: fix exclude_replies (closes #1287) Closes #1287 See merge request pleroma/pleroma!1813
2019-10-07Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-10-07Admin API: Reports, grouped by statusMaxim Filippov
2019-10-07Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-10-07mastodon api: fix exclude_replies (closes #1287)Ariadne Conill
2019-10-07Merge branch 'feature/move-rss-out-of-ostatus' into 'develop'kaniini
Extract RSS Feed functionality from OStatus Closes #1243 See merge request pleroma/pleroma!1644
2019-10-07Extract RSS Feed functionality from OStatusSergey Suprunenko
2019-10-07Merge branch 'develop' into 'reactions'lain
# Conflicts: # priv/static/schemas/litepub-0.1.jsonld
2019-10-07Merge branch 'chore/context-cleanups' into 'develop'kaniini
clean up bundled litepub schema (closes #1303) Closes #1303 See merge request pleroma/pleroma!1808
2019-10-07clean up bundled litepub schema (closes #1303)Ariadne Conill
2019-10-07Linting.lain
2019-10-07Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-07Merge branch 'mrf/simple_policy/check_actor' into 'develop'kaniini
mrf/simple_policy: check actor against accept/reject See merge request pleroma/pleroma!1806
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-07 05:43:42 +0000