aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-10-07Merge branch '1260-rate-limited-auth-actions' into 'develop'Haelwenn
[#1260] Rate-limiting for create authentication and related requests Closes #1260 See merge request pleroma/pleroma!1681
2019-10-07Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions # Conflicts: # CHANGELOG.md
2019-10-07Merge branch 'misskey-compat' into 'reactions'lain
Transmogrifier: Handle misskey likes with reactions like EmojiReactions. See merge request pleroma/pleroma!1783
2019-10-07Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'Haelwenn
[#1234] Mastodon 2.4.3 hierarchical OAuth scopes Closes #1234 See merge request pleroma/pleroma!1643
2019-10-07mrf/simple_policy: check actor against accept/rejectHaelwenn (lanodan) Monnier
2019-10-06Merge branch 'fix/bad-migration' into 'develop'kaniini
Fix muted notification migration only working with a schema See merge request pleroma/pleroma!1803
2019-10-06Fix muted notification migration only working with a schemarinpatch
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
2019-10-06Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'kaniini
Move local keys out of `user.info` See merge request pleroma/pleroma!1799
2019-10-06Fix the use of queries with a schema in a migrationrinpatch
2019-10-06Merge branch 'fix/report-email' into 'develop'feld
Fix/report email Closes #1300 See merge request pleroma/pleroma!1800
2019-10-06Use the user.id instead of nickname in report URLsfeld
Ensures links to profiles of remote users work.
2019-10-06[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
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
2019-10-06Move local keys out of `user.info`rinpatch
2019-10-06Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
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
2019-10-06Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-10-06Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions # Conflicts: # CHANGELOG.md
2019-10-06Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'Haelwenn
Fix custom fields of accounts update credentials See merge request pleroma/pleroma!1597
2019-10-05Merge branch 'split-masto-api/leftovers' into 'develop'kaniini
[#1278] Move a few more actions from MastodonAPIController See merge request pleroma/pleroma!1761
2019-10-05Merge branch 'accept-embedded-announce-object' into 'develop'kaniini
Import object from self-Announce whenever possible See merge request pleroma/pleroma!1770
2019-10-05Merge branch 'unread-conversation-count' into 'develop'kaniini
Add `pleroma.unread_conversation_count` to the Account entity See merge request pleroma/pleroma!1796
2019-10-05Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-05Merge branch 'update-activity-fixes' into 'develop'kaniini
Update activity fixes Closes #1298 See merge request pleroma/pleroma!1795
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 10:39:13 +0000