aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-17Merge branch 'develop' into issue/733Maksim Pechnikov
2019-09-17Merge branch 'fix-notification-warnings' into 'develop'rinpatch
Fix notification warnings See merge request pleroma/pleroma!1683
2019-09-17Fix notification warningsSteven Fuchs
2019-09-17Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'Haelwenn
Fix `Transmogrifier.upgrade_user_from_ap_id/1` See merge request pleroma/pleroma!1677
2019-09-17Merge branch 'support/tests' into 'develop'rinpatch
add tests for activity_pub/utils.ex See merge request pleroma/pleroma!1627
2019-09-17Merge branch 'eliminate-test-errors' into 'develop'rinpatch
remove remaining errors from tests See merge request pleroma/pleroma!1682
2019-09-17remove remaining errors from testsSteven Fuchs
2019-09-17Refactor SubscriptionNotificationViewRoman Chvanikov
2019-09-17Merge branch 'deps/update-oban' into 'develop'rinpatch
Update oban to 0.8.1 Closes #1261 See merge request pleroma/pleroma!1680
2019-09-17Move pleroma_api controllers into controllers sub-foldersRoman Chvanikov
2019-09-17Rename SubscriptionNotificationController list and get actions to index and showRoman Chvanikov
2019-09-17Cleanup PleromaAPIControllerRoman Chvanikov
2019-09-17Apply suggestion to ↵Roman Chvanikov
test/web/pleroma_api/subscription_notification_controller_test.exs
2019-09-17Apply suggestion to lib/pleroma/web/router.exRoman Chvanikov
2019-09-17Apply suggestion to ↵Roman Chvanikov
lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17Apply suggestion to ↵Roman Chvanikov
lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17Apply suggestion to ↵Roman Chvanikov
lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17[#1260] Rate-limiting for create authentication and related requests.Ivan Tashkinov
2019-09-17Mastodon API: Add a setting to hide follow/follower count from the user view ↵eugenijm
(`hide_follows_count` and `hide_followers_count`)
2019-09-17Update oban to 0.8.1rinpatch
This version uses a different locking mechanism, which gets rid of `WARNING: you don't own a lock of type ShareLock` log spam
2019-09-16Move subscription notifications to a separate controllerRoman Chvanikov
2019-09-16Code style fixesRoman Chvanikov
2019-09-16Merge developRoman Chvanikov
2019-09-16Merge branch 'develop' into feature/moderation-log-filtersMaxim Filippov
2019-09-16Merge branch 'update-fields-limit' into 'develop'Haelwenn
Set `account_field_value_length` limit to 2048 by default Closes #1249 See merge request pleroma/pleroma!1678
2019-09-16Set `account_field_value_length` limit to 2048 by defaultEgor Kislitsyn
2019-09-16Fix `Transmogrifier.upgrade_user_from_ap_id/1`Egor Kislitsyn
2019-09-16Merge branch 'develop' into feature/return-total-for-reportsMaxim Filippov
2019-09-16Merge branch 'fix/develop' into 'develop'rinpatch
Add "Streamer refactoring" back to `develop` See merge request pleroma/pleroma!1675
2019-09-16Revert "Merge branch 'revert-4fabf83a' into 'develop'"Egor Kislitsyn
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
2019-09-16Merge branch 'fix/signed-fetch-inclusion-test' into 'develop'rinpatch
Fix signed fetch inclusion publisher test See merge request pleroma/pleroma!1676
2019-09-16Fix signed fetch inclusion publisher testrinpatch
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
2019-09-16Merge branch 'revert-4fabf83a' into 'develop'kaniini
Revert "Merge branch 'streamer-refactoring' into 'develop'" See merge request pleroma/pleroma!1674
2019-09-16Revert "Merge branch 'streamer-refactoring' into 'develop'"kaniini
This reverts merge request !1653
2019-09-16Merge branch 'streamer-refactoring' into 'develop'kaniini
Streamer refactoring See merge request pleroma/pleroma!1653
2019-09-16Streamer refactoringSteven Fuchs
2019-09-16Merge branch 'feature/delivery-tracking' into 'develop'kaniini
Track signed fetches of objects and use them for delete federation See merge request pleroma/pleroma!1661
2019-09-16Merge branch 'feature/optimize_rich_media_parser' into 'develop'kaniini
added prepare html for RichMedia.Parser See merge request pleroma/pleroma!1672
2019-09-16Merge branch 'fix/race-in-tests' into 'develop'kaniini
Fix a race condition in tests See merge request pleroma/pleroma!1673
2019-09-16Fix a race condition in testsEgor Kislitsyn
2019-09-16Restore tests for `change_password` and `delete_account`Egor Kislitsyn
2019-09-16Merge branch 'develop' into issue/733Maksim Pechnikov
2019-09-15Merge branch '1149-oban-job-queue' into 'develop'rinpatch
[#1149] `oban`-based job & retry queues Closes #1149 See merge request pleroma/pleroma!1518
2019-09-15[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex # lib/pleroma/web/router.ex
2019-09-15[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).Ivan Tashkinov
2019-09-15added prepare html for RichMedia.ParserMaksim Pechnikov
2019-09-15Merge branch 'develop' into support/testsMaksim Pechnikov
2019-09-15[#1149] Reinstated docs/config.md changes.Ivan Tashkinov
2019-09-15[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md
2019-09-14Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'rinpatch
Backport a test fix to 1.1 See merge request pleroma/pleroma!1671
generated by cgit v1.2.3 (git 2.26.2) at 2025-05-14 08:14:41 +0000