Ekaterina Vaartis
|
2a94eca096
|
Change YAML to JSON
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
2d4b8f3d20
|
Add an endpoint for deleting emoji packs
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
7e4c8b56ea
|
Add tests for emoji pack sharing
|
2019-09-19 00:16:33 +03:00 |
|
feld
|
ab2ca3038f
|
Merge branch 'hide-follower-following-count' into 'develop'
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
|
2019-09-18 21:13:15 +00:00 |
|
feld
|
25b4365656
|
Merge branch 'admin_api_invite_tokens' into 'develop'
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
|
2019-09-18 21:11:37 +00:00 |
|
feld
|
220afadc55
|
Merge branch 'restore-tests' into 'develop'
Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658
|
2019-09-18 21:05:18 +00:00 |
|
Haelwenn
|
56286447ee
|
Merge branch 'fix/test-upload-cleanup' into 'develop'
Cleanup uploads after the tests are finished
See merge request pleroma/pleroma!1695
|
2019-09-18 21:00:09 +00:00 |
|
rinpatch
|
a12aeb09c4
|
Cleanup uploads after the tests are finished
|
2019-09-18 23:34:13 +03:00 |
|
rinpatch
|
eb87a86b5b
|
Preserve internal fields when reinjecting
|
2019-09-18 19:53:51 +03:00 |
|
rinpatch
|
84a40f6f26
|
Capture log in object refetch tests
|
2019-09-18 18:31:24 +03:00 |
|
rinpatch
|
7ef575d11e
|
Initial poll refresh support
Implement refreshing the object with an interval and call the function
when getting the poll.
|
2019-09-18 18:13:21 +03:00 |
|
Alex S
|
4faf2b1555
|
post for creating invite tokens in admin api
|
2019-09-18 10:49:14 +03:00 |
|
rinpatch
|
ef2e2c5e12
|
Merge branch 'feature/return-total-for-reports' into 'develop'
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
|
2019-09-17 19:09:56 +00:00 |
|
rinpatch
|
95a4a19417
|
Merge branch 'support/tests' into 'develop'
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
|
2019-09-17 14:47:26 +00:00 |
|
Steven Fuchs
|
80c5c3495b
|
remove remaining errors from tests
|
2019-09-17 14:44:52 +00:00 |
|
eugenijm
|
450bf7a63c
|
Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)
|
2019-09-17 14:45:47 +03:00 |
|
Maxim Filippov
|
219dca1b00
|
Merge branch 'develop' into feature/return-total-for-reports
|
2019-09-16 14:40:17 +03: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
|
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
|
c623b4324d
|
Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
|
2019-09-16 09:09:21 +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 |
|
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
|
8751809e1e
|
Merge branch 'develop' into support/tests
|
2019-09-15 14:22:15 +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
|
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 |
|
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 |
|
Egor Kislitsyn
|
b870ae08fd
|
Fix Activity.all_by_actor_and_id/2 test
|
2019-09-14 19:31:20 +07: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 |
|
rinpatch
|
ba70a8cae6
|
Merge branch 'develop' into feature/delivery-tracking
|
2019-09-13 19:42:53 +03:00 |
|
stwf
|
25a64a4aa0
|
Capture test error messages where appropriate
|
2019-09-13 11:46:41 -04:00 |
|
lain
|
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 |
|
Haelwenn
|
0d9609894f
|
Merge branch 'feature/change-email' into 'develop'
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
|
2019-09-13 12:46:16 +00:00 |
|
rinpatch
|
f884987ace
|
Merge branch 'admin-config-description' into 'develop'
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
|
2019-09-13 12:36:24 +00:00 |
|
rinpatch
|
fb96facc32
|
Remove unused functions and fix credo issues
|
2019-09-13 12:29:42 +03:00 |
|
rinpatch
|
ce23529d91
|
Use delivery info when federating deletes
|
2019-09-13 11:38:17 +03:00 |
|
Egor Kislitsyn
|
25d8216804
|
Add email change endpoint
|
2019-09-13 13:09:35 +07:00 |
|
Egor Kislitsyn
|
5bfbad13ad
|
Add more tests for Pleroma.Activity
|
2019-09-13 12:49:52 +07:00 |
|
Egor Kislitsyn
|
39dc9b470c
|
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
|
2019-09-13 12:44:59 +07:00 |
|
rinpatch
|
769fb778d4
|
Track object/create activity fetches
|
2019-09-12 21:37:36 +03:00 |
|
Mark Felder
|
102eb4455c
|
Fix associated test as well
|
2019-09-12 12:29:08 -05:00 |
|
Alex S
|
a1f2dfb10a
|
expanding regex sigils to use modifiers
|
2019-09-11 09:25:33 +03:00 |
|
Egor Kislitsyn
|
3d12e05f43
|
Fix Activity.all_by_ids_with_object/1 test
|
2019-09-11 01:08:37 +07:00 |
|
Egor Kislitsyn
|
b40b10b53d
|
Add an endpoint to get multiple statuses by IDs
|
2019-09-10 13:39:45 +07:00 |
|
minibikini
|
11e12b5761
|
Add Pleroma.Plugs.Cache
|
2019-09-09 18:53:08 +00:00 |
|
Egor Kislitsyn
|
e0f84d0043
|
Fix ActivityPubController.read_inbox/2
|
2019-09-10 01:11:57 +07:00 |
|