nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
7039 commits 2 branches 0 tags 272 MiB
Commit graph

7039 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Chvanikov 6042e21b25 Move subscription notifications to a separate controller 2019-09-16 21:59:49 +03:00
Roman Chvanikov 56b60798c2 Code style fixes 2019-09-16 20:50:14 +03:00
Roman Chvanikov 76c3e290fc Merge develop 2019-09-16 20:30:42 +03:00
Maxim Filippov df15ed13d1 Merge branch 'develop' into feature/moderation-log-filters 2019-09-16 19:44:06 +03:00
Haelwenn a58f29b826 Merge branch 'update-fields-limit' into 'develop' 
Set `account_field_value_length` limit to 2048 by default

Closes #1249

See merge request pleroma/pleroma!1678
 2019-09-16 15:11:05 +00:00
Egor Kislitsyn d6ab78e610 Set account_field_value_length limit to 2048 by default 2019-09-16 21:48:01 +07:00
Egor Kislitsyn 085d014f08 Fix Transmogrifier.upgrade_user_from_ap_id/1 2019-09-16 19:26:00 +07:00
Maxim Filippov 219dca1b00 Merge branch 'develop' into feature/return-total-for-reports 2019-09-16 14:40:17 +03:00
rinpatch 409e701ab8 Merge branch 'fix/develop' into 'develop' 
Add "Streamer refactoring" back to `develop`

See merge request pleroma/pleroma!1675
 2019-09-16 10:59:44 +00:00
Egor Kislitsyn 96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'" 
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
 2019-09-16 17:55:04 +07:00
rinpatch 4397a3fe4a Merge branch 'fix/signed-fetch-inclusion-test' into 'develop' 
Fix signed fetch inclusion publisher test

See merge request pleroma/pleroma!1676
 2019-09-16 10:34:03 +00:00
rinpatch e8120944d8 Fix signed fetch inclusion publisher test 
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
 2019-09-16 13:23:06 +03:00
kaniini fe7fd33126 Merge branch 'revert-4fabf83a' into 'develop' 
Revert "Merge branch 'streamer-refactoring' into 'develop'"

See merge request pleroma/pleroma!1674
 2019-09-16 09:09:32 +00:00
kaniini c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'" 
This reverts merge request !1653
 2019-09-16 09:09:21 +00:00
kaniini 4fabf83ad0 Merge branch 'streamer-refactoring' into 'develop' 
Streamer refactoring

See merge request pleroma/pleroma!1653
 2019-09-16 07:44:03 +00:00
Steven Fuchs aab264db82 Streamer refactoring 2019-09-16 07:44:03 +00:00
kaniini 17142a3720 Merge branch 'feature/delivery-tracking' into 'develop' 
Track signed fetches of objects and use them for delete federation

See merge request pleroma/pleroma!1661
 2019-09-16 07:39:58 +00:00
kaniini d1a84ceec8 Merge branch 'feature/optimize_rich_media_parser' into 'develop' 
added prepare html for RichMedia.Parser

See merge request pleroma/pleroma!1672
 2019-09-16 07:37:54 +00:00
kaniini 74eba5afe2 Merge branch 'fix/race-in-tests' into 'develop' 
Fix a race condition in tests

See merge request pleroma/pleroma!1673
 2019-09-16 07:36:57 +00:00
Egor Kislitsyn ca88e37a8f Fix a race condition in tests 2019-09-16 12:55:05 +07:00
Egor Kislitsyn 43f17c2e67 Restore tests for change_password and delete_account 2019-09-16 12:34:47 +07:00
Maksim Pechnikov d75bc728e7 Merge branch 'develop' into issue/733 2019-09-16 07:34:22 +03:00
rinpatch 2990c0a53b Merge branch '1149-oban-job-queue' into 'develop' 
[#1149] `oban`-based job & retry queues

Closes #1149

See merge request pleroma/pleroma!1518
 2019-09-15 20:22:17 +00:00
Maksim Pechnikov b4cf74c106 added prepare html for RichMedia.Parser 2019-09-15 14:53:58 +03:00
Maksim Pechnikov 8751809e1e Merge branch 'develop' into support/tests 2019-09-15 14:22:15 +03:00
Ivan Tashkinov 3b8ec98b0e [#1149] Reinstated docs/config.md changes. 2019-09-15 10:15:57 +03:00
Ivan Tashkinov 610236d6be [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	docs/config.md
 2019-09-15 10:12:24 +03:00
rinpatch 9c64a25713 Merge branch 'config-changes' into 'develop' 
two separate files for config.md and generated config.md

See merge request pleroma/pleroma!1666
 2019-09-14 17:26:35 +00:00
rinpatch 62bbba80f3 Merge branch 'fix/truncate-remote-user-fields' into 'develop' 
Truncate remote user fields

See merge request pleroma/pleroma!1619
 2019-09-14 16:39:42 +00:00
Roman Chvanikov d7457c9165 Merge branch 'develop' into refactor/subscription 2019-09-14 18:29:51 +03:00
Ivan Tashkinov e127b9ab6d [#1149] Rewritten readme as config/description.exs. 2019-09-14 16:28:59 +03:00
Ivan Tashkinov 6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	docs/config.md
#	mix.lock
 2019-09-14 16:11:44 +03:00
rinpatch 3ae448b592 Merge branch 'fix-tests' into 'develop' 
Fix `Activity.all_by_actor_and_id/2` test

See merge request pleroma/pleroma!1668
 2019-09-14 12:36:08 +00:00
Egor Kislitsyn b870ae08fd Fix Activity.all_by_actor_and_id/2 test 2019-09-14 19:31:20 +07:00
rinpatch 4264c4b7e5 Merge branch 'security/fav-reblog-access-control' into 'develop' 
Mastodon API: Respect post privacy in favourited/reblogged endpoints

See merge request pleroma/pleroma!1667
 2019-09-14 11:44:34 +00:00
rinpatch a78a7ee455 Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs 2019-09-14 10:50:08 +00:00
rinpatch 85b6144ffd Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs 2019-09-14 10:46:35 +00:00
rinpatch 5c5ebd3861 Mastodon API: Respect post privacy in favourited/reblogged endpoints 2019-09-14 01:50:15 +03:00
lain a9b78f55e3 Merge branch 'capture-test-errors' into 'develop' 
Capture test error messages where appropriate

See merge request pleroma/pleroma!1665
 2019-09-13 17:07:14 +00:00
lain 1be09bde2d Merge branch 'refactor/add_link_headers' into 'develop' 
Refactor `add_link_headers/7` -> `add_link_headers/3`

See merge request pleroma/pleroma!1636
 2019-09-13 17:06:38 +00:00
rinpatch ba70a8cae6 Merge branch 'develop' into feature/delivery-tracking 2019-09-13 19:42:53 +03:00
rinpatch ac4a748fad Disallow NULLs in deliveries 2019-09-13 19:28:35 +03:00
Alex S 4da0da9aa4 don't track generated_config.md 2019-09-13 19:13:04 +03:00
Alex S c625fe6f09 config.md back 2019-09-13 19:03:39 +03:00
Alex S 69faec031d markdown generation to the new file 2019-09-13 19:02:42 +03:00
stwf 25a64a4aa0 Capture test error messages where appropriate 2019-09-13 11:46:41 -04:00
Roman Chvanikov 0bd2b85edb Separate Subscription Notifications from regular Notifications 2019-09-13 18:25:27 +03:00
rinpatch 8900cb68ae Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex 2019-09-13 15:25:15 +00:00
rinpatch 05f8a066a1 Apply suggestion to lib/pleroma/delivery.ex 2019-09-13 15:23:26 +00:00
rinpatch 2784962dba Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex 2019-09-13 15:23:03 +00:00