summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-17Update Tesla to 1.3rinpatch
This version includes a couple of fixes, adds Gun and Mint adapters and removes 0.x -> 1.0 config migrator, which for some reason fails under certain conditions. I had to set `override: true` because Quack pins Tesla to `1.2.0`, but I have looked through the source code and verified that updating Tesla doesn't break anything there.
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-17Merge branch 'deps/update-oban' into 'develop'rinpatch
Update oban to 0.8.1 Closes #1261 See merge request pleroma/pleroma!1680
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-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 '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-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-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 'config-changes' into 'develop'rinpatch
two separate files for config.md and generated config.md See merge request pleroma/pleroma!1666
2019-09-14Merge branch 'fix/truncate-remote-user-fields' into 'develop'rinpatch
Truncate remote user fields See merge request pleroma/pleroma!1619
2019-09-14[#1149] Rewritten readme as config/description.exs.Ivan Tashkinov
2019-09-14[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md # mix.lock
2019-09-14Merge branch 'fix-tests' into 'develop'rinpatch
Fix `Activity.all_by_actor_and_id/2` test See merge request pleroma/pleroma!1668
2019-09-14Fix `Activity.all_by_actor_and_id/2` testEgor Kislitsyn
2019-09-14Merge branch 'security/fav-reblog-access-control' into 'develop'rinpatch
Mastodon API: Respect post privacy in favourited/reblogged endpoints See merge request pleroma/pleroma!1667
2019-09-14Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exsrinpatch
2019-09-14Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exsrinpatch
2019-09-14Mastodon API: Respect post privacy in favourited/reblogged endpointsrinpatch
2019-09-13Merge branch 'capture-test-errors' into 'develop'lain
Capture test error messages where appropriate See merge request pleroma/pleroma!1665
2019-09-13Merge branch 'refactor/add_link_headers' into 'develop'lain
Refactor `add_link_headers/7` -> `add_link_headers/3` See merge request pleroma/pleroma!1636
2019-09-13Merge branch 'develop' into feature/delivery-trackingrinpatch
2019-09-13Disallow NULLs in deliveriesrinpatch
2019-09-13don't track generated_config.mdAlex S
2019-09-13config.md backAlex S
2019-09-13markdown generation to the new fileAlex S
2019-09-13Capture test error messages where appropriatestwf
2019-09-13Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
2019-09-13Apply suggestion to lib/pleroma/delivery.exrinpatch
2019-09-13Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 19:09:11 +0000