c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
4fabf83ad0
Merge branch 'streamer-refactoring' into 'develop'
...
Streamer refactoring
See merge request pleroma/pleroma!1653
2019-09-16 07:44:03 +00:00
aab264db82
Streamer refactoring
2019-09-16 07:44:03 +00:00
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
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
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
ca88e37a8f
Fix a race condition in tests
2019-09-16 12:55:05 +07:00
43f17c2e67
Restore tests for `change_password` and `delete_account`
2019-09-16 12:34:47 +07:00
d75bc728e7
Merge branch 'develop' into issue/733
2019-09-16 07:34:22 +03:00
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
efbc2edba1
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 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 18:52:27 +03:00
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
2019-09-15 18:22:08 +03:00
b4cf74c106
added prepare html for RichMedia.Parser
2019-09-15 14:53:58 +03:00
8751809e1e
Merge branch 'develop' into support/tests
2019-09-15 14:22:15 +03:00
3b8ec98b0e
[ #1149 ] Reinstated docs/config.md changes.
2019-09-15 10:15:57 +03:00
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
6c3f5e8ba0
Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'
...
Backport a test fix to 1.1
See merge request pleroma/pleroma!1671
2019-09-14 18:14:54 +00:00
c64ab84e6a
Merge branch 'fix-tests' into 'develop'
...
Fix `Activity.all_by_actor_and_id/2` test
See merge request pleroma/pleroma!1668
(cherry picked from commit 3ae448b592b870ae08
2019-09-14 18:14:39 +00:00
e71d662d3a
Merge branch 'cherry-pick-9c64a257' into 'maint/1.1'
...
Backport config.md readdition to 1.1
See merge request pleroma/pleroma!1670
2019-09-14 18:14:21 +00:00
ea1867f48e
Merge branch 'config-changes' into 'develop'
...
two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666
(cherry picked from commit 9c64a2571369faec03c625fe6f4da0da9a
2019-09-14 17:27:08 +00:00
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
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
d7457c9165
Merge branch 'develop' into refactor/subscription
2019-09-14 18:29:51 +03:00
e127b9ab6d
[ #1149 ] Rewritten readme as config/description.exs.
2019-09-14 16:28:59 +03:00
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
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
90b0bd3984
Merge branch 'backport/fav-reblog-access-control' into 'maint/1.1'
...
Backport/fav reblog access control
See merge request pleroma/pleroma!1669
2019-09-14 12:34:21 +00:00
b870ae08fd
Fix `Activity.all_by_actor_and_id/2` test
2019-09-14 19:31:20 +07:00
dca545bb0d
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
2019-09-14 15:25:21 +03:00
ae33cca4cf
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
2019-09-14 15:25:10 +03:00
056780fd8e
Mastodon API: Respect post privacy in favourited/reblogged endpoints
2019-09-14 15:21:15 +03:00
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
a78a7ee455
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
2019-09-14 10:50:08 +00:00
85b6144ffd
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
2019-09-14 10:46:35 +00:00
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
2019-09-14 01:50:15 +03:00
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
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
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
2019-09-13 19:42:53 +03:00
ac4a748fad
Disallow NULLs in deliveries
2019-09-13 19:28:35 +03:00
6fe2f554c3
Emoji: Generate emoji detecting functions at compile time.
...
Suggested by jvalim
2019-09-13 18:27:32 +02:00
4da0da9aa4
don't track generated_config.md
2019-09-13 19:13:04 +03:00
c625fe6f09
config.md back
2019-09-13 19:03:39 +03:00
69faec031d
markdown generation to the new file
2019-09-13 19:02:42 +03:00
25a64a4aa0
Capture test error messages where appropriate
2019-09-13 11:46:41 -04:00
0bd2b85edb
Separate Subscription Notifications from regular Notifications
2019-09-13 18:25:27 +03:00
8900cb68ae
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 15:25:15 +00:00
05f8a066a1
Apply suggestion to lib/pleroma/delivery.ex
2019-09-13 15:23:26 +00:00
2784962dba
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 15:23:03 +00:00
53a3ad6043
Merge branch 'cleanup-activity' into 'develop'
...
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
2019-09-13 14:48:00 +00:00
3ff5532220
Linting.
2019-09-13 16:41:30 +02:00
kaniini