Ivan Tashkinov
|
b17f217bf3
|
[#1234] Addressed code analysis issue.
|
2019-09-17 23:31:05 +03:00 |
|
Ivan Tashkinov
|
01c1078015
|
[#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
|
2019-09-17 22:53:26 +03:00 |
|
Maksim Pechnikov
|
0447c42715
|
Merge branch 'develop' into issue/733
|
2019-09-17 22:20:39 +03:00 |
|
Ivan Tashkinov
|
76068873db
|
[#1234] Defined admin OAuth scopes, refined other scopes. Added tests.
|
2019-09-17 22:19:39 +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 |
|
Maksim Pechnikov
|
7dd51652f9
|
Merge branch 'develop' into issue/733
|
2019-09-17 21:20:08 +03: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 |
|
Roman Chvanikov
|
e9f69a3eb7
|
Move pleroma_api controllers into controllers sub-folders
|
2019-09-17 16:52:23 +03:00 |
|
Roman Chvanikov
|
7d1773bc6b
|
Rename SubscriptionNotificationController list and get actions to index and show
|
2019-09-17 16:48:24 +03:00 |
|
Roman Chvanikov
|
015597c2ab
|
Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs
|
2019-09-17 13:43:15 +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 |
|
Roman Chvanikov
|
6042e21b25
|
Move subscription notifications to a separate controller
|
2019-09-16 21:59:49 +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 |
|
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
|
d75bc728e7
|
Merge branch 'develop' into issue/733
|
2019-09-16 07:34:22 +03:00 |
|
Ivan Tashkinov
|
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 |
|
Ivan Tashkinov
|
e6f43a831b
|
[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
|
2019-09-15 18:22:08 +03: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 |
|
Roman Chvanikov
|
d7457c9165
|
Merge branch 'develop' into refactor/subscription
|
2019-09-14 18:29:51 +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 |
|
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 |
|
Roman Chvanikov
|
0bd2b85edb
|
Separate Subscription Notifications from regular Notifications
|
2019-09-13 18:25:27 +03: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 |
|
Maksim Pechnikov
|
bc3e8c033b
|
fix formatting
|
2019-09-13 15:06:34 +03:00 |
|
Maksim Pechnikov
|
ec5aaf5bd7
|
fix tests
|
2019-09-13 14:59:58 +03: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 |
|
Maksim Pechnikov
|
d8a178274b
|
fix Activity.get_by_id
|
2019-09-13 07:12:34 +03:00 |
|
Maksim
|
58b17196fa
|
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
|
2019-09-13 03:58:58 +00:00 |
|
Maksim Pechnikov
|
2b40e57a72
|
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
|
2019-09-13 06:55:05 +03:00 |
|
Maksim Pechnikov
|
936951826e
|
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
|
2019-09-12 22:15:43 +03: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 |
|
Maksim Pechnikov
|
4f548cb2b7
|
added test for Ostatus
|
2019-09-12 10:25:43 +03:00 |
|
Maksim Pechnikov
|
007e0c1ce1
|
added tests
|
2019-09-11 23:19:06 +03:00 |
|
Alex S
|
a1f2dfb10a
|
expanding regex sigils to use modifiers
|
2019-09-11 09:25:33 +03:00 |
|
Maksim Pechnikov
|
fcf604fa43
|
added tests
|
2019-09-11 07:23:33 +03:00 |
|
Egor Kislitsyn
|
3d12e05f43
|
Fix Activity.all_by_ids_with_object/1 test
|
2019-09-11 01:08:37 +07:00 |
|
Maksim Pechnikov
|
a31af93e1d
|
added tests /activity_pub/transmogrifier.ex
|
2019-09-10 16:43:10 +03:00 |
|
Egor Kislitsyn
|
b40b10b53d
|
Add an endpoint to get multiple statuses by IDs
|
2019-09-10 13:39:45 +07:00 |
|
Maxim Filippov
|
d1abf7a358
|
Merge branch 'develop' into feature/moderation-log-filters
|
2019-09-10 01:23:20 +03: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 |
|
Ivan Tashkinov
|
b63faf9819
|
[#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
|
2019-09-08 15:00:03 +03:00 |
|
Maksim Pechnikov
|
39f99dc6cd
|
Merge branch 'develop' into support/tests
|
2019-09-07 22:13:43 +03:00 |
|
Maksim Pechnikov
|
ab2f21e470
|
tests for mastodon_api_controller.ex
|
2019-09-06 21:50:00 +03:00 |
|
Maksim Pechnikov
|
eb74c3d5c7
|
Merge branch 'develop' into issue/1218
|
2019-09-06 14:01:07 +03:00 |
|
Ivan Tashkinov
|
ca1ba1e272
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
|
2019-09-06 13:26:05 +03:00 |
|
rinpatch
|
896ffabe37
|
Merge branch 'so-long-twitterapi' into 'develop'
Removing TwitterAPI
See merge request pleroma/pleroma!1605
|
2019-09-06 08:43:38 +00:00 |
|
Haelwenn
|
fe7cf44c40
|
Merge branch 'feature/mastoapi-accounts-external' into 'develop'
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622
|
2019-09-05 12:48:27 +00:00 |
|
rinpatch
|
b312ca3d52
|
Mastodon API Poll view: Fix handling of polls without an end date
|
2019-09-05 12:03:39 +03:00 |
|
Ivan Tashkinov
|
79cf629e1a
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
2019-09-05 11:30:41 +03:00 |
|
Maxim Filippov
|
af746fa4a8
|
Return total for reports
|
2019-09-04 20:08:13 +03:00 |
|
Maxim Filippov
|
3542ca6702
|
Merge branch 'develop' into feature/moderation-log-filters
|
2019-09-04 19:40:07 +03:00 |
|
Sadposter
|
2975da284b
|
truncate remote user bio/display name
|
2019-09-04 15:45:40 +01:00 |
|
Maksim Pechnikov
|
8cbad5500c
|
add tests for activity_pub/utils.ex
|
2019-09-04 15:25:12 +03:00 |
|
rinpatch
|
3face45467
|
Mastodon API: Add pleroma.thread_muted to Status entity
Needed for pleroma-fe!941
|
2019-09-04 14:17:23 +03:00 |
|
rinpatch
|
c2b6c1b089
|
Extend /api/pleroma/notifications/read to mark multiple notifications
as read and make it respond with Mastoapi entities
|
2019-09-04 12:38:27 +03:00 |
|
rinpatch
|
cc1d1ee406
|
Mastdon API: Add ability to get a remote account by nickname to
`/api/v1/accounts/:id`
|
2019-09-03 19:26:10 +03:00 |
|
Ivan Tashkinov
|
eb17cc17a1
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# CHANGELOG.md
|
2019-09-03 17:12:15 +03:00 |
|
Maxim Filippov
|
b15cfd80ef
|
Return "total" optionally
|
2019-09-03 13:58:27 +03:00 |
|
Maxim Filippov
|
a4c5f71e93
|
Return total from pagination + tests
|
2019-09-02 22:48:52 +03:00 |
|
Ivan Tashkinov
|
b49085c156
|
[#1149] Refactoring: GenServer workers renamed to daemons, use Oban.Worker moved to helper.
|
2019-09-02 14:57:40 +03:00 |
|
Sadposter
|
e73685834c
|
add mandatory fields for user update
|
2019-09-02 12:35:55 +01:00 |
|
Sadposter
|
05c935c396
|
mix format
|
2019-09-02 12:15:40 +01:00 |
|
Sadposter
|
35ef470d00
|
truncate fields for remote users instead
|
2019-09-02 12:15:21 +01:00 |
|
Maxim Filippov
|
6c2fd1b78b
|
Fix tests
|
2019-09-01 21:38:15 +03:00 |
|
Ivan Tashkinov
|
a90ea8ba15
|
[#1149] Addressed code review comments (code style, jobs pruning etc.).
|
2019-08-31 19:08:56 +03:00 |
|
Ivan Tashkinov
|
e890ea7e82
|
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
2019-08-31 14:25:43 +03:00 |
|
rinpatch
|
9cabc02864
|
Remove a useless import
|
2019-08-31 10:57:35 +03:00 |
|
rinpatch
|
dbfcba85ec
|
Add a changelog entry for twitterapi removal and fix credo issues
|
2019-08-31 10:45:37 +03:00 |
|
rinpatch
|
64410497d2
|
Remove TwitterAPI representers
|
2019-08-31 10:41:15 +03:00 |
|
rinpatch
|
985122cc03
|
Remove Activity, User and Notification views from TwitterAPI
|
2019-08-31 10:31:15 +03:00 |
|
rinpatch
|
90c2dae9a4
|
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
|
2019-08-31 10:20:34 +03:00 |
|
Maksim Pechnikov
|
6ef0103ca0
|
added Emoji struct
|
2019-08-31 10:14:53 +03:00 |
|
Maxim Filippov
|
f182f0f6bd
|
Add ability to search moderation logs
|
2019-08-31 00:57:15 +03:00 |
|
Maksim Pechnikov
|
d8098d142a
|
added Emoji.Formatter
|
2019-08-30 22:04:17 +03:00 |
|
Maksim Pechnikov
|
d7808b5db4
|
added code\path fields without html tags in ets
|
2019-08-30 07:30:54 +03:00 |
|
Maksim Pechnikov
|
cef2e980b1
|
division emoji.ex on loader.ex and emoji.ex
|
2019-08-30 07:30:54 +03:00 |
|
Haelwenn
|
d9d7765383
|
Merge branch 'fix-osada-follow' into 'develop'
Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604
|
2019-08-28 07:10:35 +00:00 |
|
lain
|
66519f2100
|
Merge branch 'list-controller' into 'develop'
Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600
|
2019-08-27 21:15:54 +00:00 |
|
Maxim Filippov
|
5e4fde1d3d
|
Filter logs by date
|
2019-08-27 20:48:16 +03:00 |
|
Maksim Pechnikov
|
00abe099cd
|
added tests for ActivityPub.like\unlike
|
2019-08-27 16:21:03 +03:00 |
|
rinpatch
|
eb1739c596
|
Remove most of TwitterAPIController
|
2019-08-27 12:29:19 +03:00 |
|
lain
|
3da65292b3
|
Transmogrifier: Fix follow handling when the actor is an object.
|
2019-08-26 14:34:52 -05:00 |
|
Maxim Filippov
|
c338224c93
|
Fix sporadic test
|
2019-08-26 17:24:22 +03:00 |
|
Egor Kislitsyn
|
019ced0558
|
Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views
|
2019-08-26 19:37:57 +07:00 |
|
Egor Kislitsyn
|
30510ade0e
|
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
|
2019-08-26 19:37:54 +07:00 |
|
Egor Kislitsyn
|
3b1b631c2a
|
Add validation in Pleroma.List.create/2
|
2019-08-26 18:59:57 +07:00 |
|
kPherox
|
eb75ea502d
|
Update test for custom fields when content-type urlencoded
|
2019-08-26 16:55:26 +09:00 |
|
kaniini
|
6dc24422dc
|
Merge branch 'issue/1177' into 'develop'
[#1177] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
|
2019-08-25 19:43:27 +00:00 |
|
Maxim Filippov
|
37dd3867bb
|
Log admin/moderator actions
|
2019-08-25 19:39:37 +00:00 |
|
kaniini
|
503139b343
|
Merge branch 'fix-all-custom-fields-deleted' into 'develop'
Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596
|
2019-08-25 19:35:28 +00:00 |
|
kPherox
|
b8777b01ae
|
Update test for custom fields when name empty string
|
2019-08-26 03:30:31 +09:00 |
|
kPherox
|
d74efde94e
|
Update test for custom profile fields
|
2019-08-26 02:06:52 +09:00 |
|
lain
|
5e7098cf69
|
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'
Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598
|
2019-08-25 16:12:13 +00:00 |
|
Haelwenn (lanodan) Monnier
|
20c3f613d8
|
HttpRequestMock: Remove useless error = error
|
2019-08-25 08:55:29 +02:00 |
|
Haelwenn (lanodan) Monnier
|
f3b1266273
|
user_test.exs: fix rel=me tests
|
2019-08-25 08:48:38 +02:00 |
|
Haelwenn (lanodan) Monnier
|
211e163770
|
Implement missing mocks for rel=me
|
2019-08-25 08:03:25 +02:00 |
|
Haelwenn (lanodan) Monnier
|
e22737ffb5
|
HttpRequestMock: Improve non-implemented error message
|
2019-08-25 07:33:46 +02:00 |
|
Haelwenn (lanodan) Monnier
|
18668447d2
|
HttpRequestMock: Log mock errors as warnings
|
2019-08-25 07:33:13 +02:00 |
|
kPherox
|
45e21a9df4
|
Rename fields to fields_attributes
|
2019-08-25 07:34:11 +09:00 |
|
lain
|
90986667ce
|
Merge branch 'admin-create-users' into 'develop'
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
|
2019-08-24 16:04:19 +00:00 |
|
lain
|
efb8818e9e
|
Activity Expiration: Switch to 'expires_in' system.
|
2019-08-24 17:22:48 +02:00 |
|
Maksim Pechnikov
|
654d291b6d
|
update tests
|
2019-08-24 17:41:53 +03:00 |
|
lain
|
cc6c0b4ba6
|
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
|
2019-08-24 15:48:33 +02:00 |
|
Maksim Pechnikov
|
73bcbf4fa3
|
add tests
|
2019-08-24 11:03:13 +03:00 |
|
Ivan Tashkinov
|
71700ea6d4
|
[#1149] Updated docs & tests.
|
2019-08-24 09:27:32 +03:00 |
|
Ivan Tashkinov
|
c29686309e
|
[#1149] Upgraded oban from 0.6.0 to 0.7.1.
|
2019-08-23 09:23:10 +03:00 |
|
Maksim Pechnikov
|
399ca9133b
|
fix test
|
2019-08-22 21:54:37 +03:00 |
|
Maksim Pechnikov
|
f95b67c933
|
Merge branch 'develop' into issue/1177
|
2019-08-22 21:13:03 +03:00 |
|
Ivan Tashkinov
|
7101ba1a21
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
2019-08-22 21:01:28 +03:00 |
|
Ivan Tashkinov
|
256ff09aa8
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
|
2019-08-22 20:59:58 +03:00 |
|
Maksim Pechnikov
|
64bfb41c55
|
fixed unfollow for relay actor
|
2019-08-22 06:57:55 +03:00 |
|
Maksim Pechnikov
|
85bd8a4e31
|
fixed clear config after test
|
2019-08-21 21:24:35 +03:00 |
|
Ariadne Conill
|
76bb3572dd
|
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
|
2019-08-20 20:20:12 +00:00 |
|
lain
|
74f7f308f8
|
Merge branch 'fix/admin-api-user-deletion' into 'develop'
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
|
2019-08-20 19:34:47 +00:00 |
|
lain
|
8340fe8fcc
|
Merge branch 'digest-template' into 'develop'
Improve digest email template
See merge request pleroma/pleroma!1565
|
2019-08-20 12:55:51 +00:00 |
|
lain
|
ef43016b2c
|
Merge branch 'feature/custom-fields' into 'develop'
Add custom profile fields
See merge request pleroma/pleroma!1488
|
2019-08-20 12:44:14 +00:00 |
|
lain
|
d2c9befc64
|
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
# Conflicts:
# CHANGELOG.md
|
2019-08-19 17:00:59 +00:00 |
|
Sergey Suprunenko
|
75a5dd41ee
|
Add more tests for Database tasks and DigestEmailWorker
|
2019-08-19 16:10:00 +00:00 |
|
Maksim
|
a320358703
|
added test helpers to clear config after tests
|
2019-08-19 15:34:29 +00:00 |
|
lain
|
49ae3191df
|
Merge branch 'hotfix/user_unfollow' into 'develop'
[#1177] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
|
2019-08-19 14:36:10 +00:00 |
|
Maksim Pechnikov
|
e652cef76b
|
removes duplicates from relay subscription list
|
2019-08-19 13:39:18 +03:00 |
|
Ariadne Conill
|
a2fdc32368
|
tests: activitypub: fix typo
|
2019-08-18 22:31:59 +00:00 |
|
kaniini
|
475fcb3e6c
|
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
|
2019-08-18 21:59:22 +00:00 |
|
kaniini
|
18c8c8d176
|
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575
|
2019-08-18 21:57:55 +00:00 |
|
Sadposter
|
58c1391c4d
|
use commonAPI in tests
|
2019-08-18 22:54:40 +01:00 |
|
Sadposter
|
94e336d9d5
|
clear follow requests when blocking a user
|
2019-08-18 20:30:57 +01:00 |
|
Maksim Pechnikov
|
3315a2a1c3
|
fixed User.unfollow with synchronization external user
|
2019-08-16 15:58:42 +03:00 |
|
lain
|
7ab2dbbdb6
|
Merge branch 'pleroma-conversations' into 'develop'
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
|
2019-08-16 12:55:33 +00:00 |
|
Mark Felder
|
6a3b1a526e
|
max_body_size -> max_body_length, as it should be
|
2019-08-15 15:34:41 -05:00 |
|
rinpatch
|
a4a3e3becd
|
Hide muted theads from home/public timelines unless with_muted is set
|
2019-08-15 17:37:30 +03:00 |
|
Maxim Filippov
|
ec969eec51
|
Merge branch 'develop' into 'fix/admin-api-user-deletion'
# Conflicts:
# CHANGELOG.md
|
2019-08-14 22:45:32 +00:00 |
|
Maxim Filippov
|
2b94ae3b39
|
Do not check if actor is active when deleting a user
|
2019-08-15 01:35:29 +03:00 |
|
Ivan Tashkinov
|
8778c16dac
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
2019-08-14 21:44:50 +03:00 |
|
Ivan Tashkinov
|
a180c1360e
|
[#1149] Oban mailer job. Adjusted tests.
|
2019-08-14 21:42:21 +03:00 |
|
stwf
|
d81f63845a
|
Implement Pleroma.Stats as GenServer
|
2019-08-14 11:59:33 -04:00 |
|
stwf
|
51bdf0cab6
|
use default child_specs
|
2019-08-14 11:55:17 -04:00 |
|
lain
|
d3af9e19ed
|
Conversations: Load relations in one query.
|
2019-08-14 17:01:11 +02:00 |
|
Egor Kislitsyn
|
4b7f1c6995
|
Improve digest email template
|
2019-08-14 20:46:05 +07:00 |
|
lain
|
560dbad538
|
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
|
2019-08-14 15:30:40 +02:00 |
|
Egor Kislitsyn
|
e457fcc479
|
Add :max_remote_account_fields config option
|
2019-08-14 14:58:06 +07:00 |
|
Egor Kislitsyn
|
f7bbf99caa
|
Use info.fields instead of source_data for remote users
|
2019-08-14 14:52:54 +07:00 |
|
Egor Kislitsyn
|
2c35d4b0b0
|
Add configurable account field name length limit
|
2019-08-14 14:52:54 +07:00 |
|
Egor Kislitsyn
|
db3c05f6b4
|
Add configurable account field value length limit
|
2019-08-14 14:52:54 +07:00 |
|
Egor Kislitsyn
|
7d6f8a7fd7
|
Linkify custom fields values in ActivityPub.UserViewx
|
2019-08-14 14:52:54 +07:00 |
|
Egor Kislitsyn
|
5178f960c3
|
Support user attachment update in Transmogrifier
|
2019-08-14 14:52:54 +07:00 |
|
Egor Kislitsyn
|
88598c9baf
|
Add profile custom fields to ActivityPub.UserView
|
2019-08-14 14:52:54 +07:00 |
|
Egor Kislitsyn
|
d6094b405d
|
Fix tests
|
2019-08-14 14:52:54 +07:00 |
|
Egor Kislitsyn
|
e0ac5c7a66
|
Add custom profile fields
|
2019-08-14 14:52:54 +07:00 |
|
rinpatch
|
9ef31767f2
|
Merge branch 'feature/mrf-vocabulary' into 'develop'
MRF Vocabulary
See merge request pleroma/pleroma!1559
|
2019-08-13 22:51:15 +00:00 |
|
kaniini
|
c3a54cc34d
|
Merge branch 'feature/mrf-describe' into 'develop'
MRF describe API
See merge request pleroma/pleroma!1561
|
2019-08-13 22:46:19 +00:00 |
|
rinpatch
|
83a3de8cc4
|
Merge branch 'length-limit-bio' into 'develop'
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
|
2019-08-13 22:40:13 +00:00 |
|
Ariadne Conill
|
4244e17de0
|
fix credo
|
2019-08-13 22:36:24 +00:00 |
|
Ariadne Conill
|
10fef2fcee
|
tests: fix up nodeinfo tests
|
2019-08-13 22:32:40 +00:00 |
|
Ariadne Conill
|
dd0b71ea6d
|
tests: add tests for MRF.describe()
|
2019-08-13 22:19:15 +00:00 |
|
Ariadne Conill
|
7089400675
|
test: add mock MRF module for describe() testing
|
2019-08-13 21:29:15 +00:00 |
|
Maksim
|
fea4d89e9f
|
tests for Web/ActivityPub/Relay
|
2019-08-13 21:12:59 +00:00 |
|
Maksim
|
04da1166db
|
tests for /web/mastodon_api/mastodon_api.ex
|
2019-08-13 21:12:37 +00:00 |
|
Ariadne Conill
|
f7e3b7ff75
|
tests: add tests for mrf_vocabulary
|
2019-08-13 20:55:42 +00:00 |
|
Ivan Tashkinov
|
0e1c481a94
|
[#1149] Added more oban workers. Refactoring.
|
2019-08-13 20:20:26 +03:00 |
|
lain
|
511ccea5aa
|
ConversationView: Align parameter names with other views.
|
2019-08-12 14:23:06 +02:00 |
|
lain
|
60231ec7bd
|
Conversation: Add endpoint to get a conversation by id.
|
2019-08-12 13:58:04 +02:00 |
|
lain
|
23c46f7e72
|
Conversations: Use 'recipients' for accounts in conversation view.
According to gargron, this is the intended usage.
|
2019-08-12 12:51:08 +02:00 |
|
Ariadne Conill
|
9cfc289594
|
MRF: ensure that subdomain_match calls are case-insensitive
|
2019-08-10 21:19:26 +00:00 |
|
kaniini
|
84808e1697
|
Merge branch 'develop' into 'fix/hide-follows-counters'
# Conflicts:
# CHANGELOG.md
|
2019-08-10 18:49:04 +00:00 |
|
Sergey Suprunenko
|
af4cf35e20
|
Strip internal fields including likes from incoming and outgoing activities
|
2019-08-10 18:47:40 +00:00 |
|
Maksim
|
11d08c2de0
|
tests for Pleroma.Uploaders
|
2019-08-10 18:46:26 +00:00 |
|
Ivan Tashkinov
|
33a5fc4a70
|
[#1149] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime.
|
2019-08-10 20:38:31 +03:00 |
|
rinpatch
|
0802a08871
|
Mastodon API: Fix thread mute detection
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
|
2019-08-10 16:27:46 +03:00 |
|
Maksim
|
bb9c539580
|
Uploader.S3 added support stream uploads
|
2019-08-10 11:27:59 +00:00 |
|
Maxim Filippov
|
dfae61c25c
|
Fix deactivated user deletion
|
2019-08-09 23:05:28 +03:00 |
|
Ivan Tashkinov
|
267262491e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
2019-08-09 20:09:56 +03:00 |
|
Ivan Tashkinov
|
b7fad8d395
|
[#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
|
2019-08-09 20:08:01 +03:00 |
|
rinpatch
|
409bcad54b
|
Mastodon API: Set follower/following counters to 0 when hiding
followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency.
|
2019-08-09 16:53:55 +03:00 |
|
lain
|
29807ef6a5
|
Merge branch 'feature/digest-email' into 'develop'
Feature/digest email
See merge request pleroma/pleroma!1078
|
2019-08-08 14:38:33 +00:00 |
|
lain
|
a2b98f6d58
|
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
|
2019-08-08 16:04:20 +02:00 |
|
Haelwenn
|
aa718ab8f6
|
Merge branch 'fix/object-reembeds' into 'develop'
Do not rembed the object after updating it
Closes #1142
See merge request pleroma/pleroma!1538
|
2019-08-06 22:14:00 +00:00 |
|
rinpatch
|
5329e84d62
|
OStatus tests: stop relying on embedded objects
|
2019-08-07 00:58:48 +03:00 |
|
rinpatch
|
32018a4ee0
|
ActivityPub tests: remove assertions of embedded object being updated,
because the objects are no longer supposed to be embedded
|
2019-08-07 00:36:13 +03:00 |
|
Maksim
|
139b196bc0
|
[#1150] fixed parser TwitterCard
|
2019-08-06 20:19:28 +00:00 |
|
lain
|
a49c92f6ae
|
Participation: Setting recipients will always add the owner.
|
2019-08-06 14:51:17 +02:00 |
|
Maksim
|
bdc9a7222c
|
tests for CommonApi/Utils
|
2019-08-05 15:37:05 +00:00 |
|
lain
|
d6fe220e32
|
Linting.
|
2019-08-05 16:11:23 +02:00 |
|
lain
|
b64b6fee2a
|
CommonAPI: Replies to conversations also get the correct context id.
|
2019-08-05 15:33:22 +02:00 |
|
lain
|
3af6d14da7
|
Pleroma Conversations API: Add a way to set recipients.
|
2019-08-05 15:09:19 +02:00 |
|
Eugenij
|
96028cd585
|
Remove Reply-To from report emails
|
2019-08-04 22:24:50 +00:00 |
|
Sergey Suprunenko
|
e8ad116c2a
|
Do not add the "next" key to likes.json if there is no more items
|
2019-08-04 17:13:06 +00:00 |
|
Alexander Strizhakov
|
de0f3b73dd
|
Admin fixes
|
2019-08-03 18:16:09 +00:00 |
|
Sergey Suprunenko
|
040347b248
|
Remove spaces from the domain search
|
2019-08-03 18:13:20 +00:00 |
|
Sergey Suprunenko
|
8b2fa31fed
|
Handle MRF rejections of incoming AP activities
|
2019-08-03 18:12:38 +00:00 |
|
lain
|
eee98aaa73
|
Pleroma API: Add endpoint to get conversation statuses.
|
2019-08-02 19:53:08 +02:00 |
|
feld
|
d93d777915
|
Fix/mediaproxy whitelist base url
|
2019-08-02 17:07:09 +00:00 |
|
Roman Chvanikov
|
9d4f34fbcb
|
Merge branch 'develop' into feature/digest-email
|
2019-08-02 18:16:04 +03:00 |
|
lain
|
56b1c3af13
|
CommonAPI: Extend api with conversation replies.
|
2019-08-02 15:05:27 +02:00 |
|
lain
|
5ff8f07ca9
|
Merge branch 'feature/hide-follows-remote' into 'develop'
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411
|
2019-08-02 11:23:07 +00:00 |
|
lain
|
f88560accd
|
Conversations: Add recipient list to conversation participation.
This enables to address the same group of people every time.
|
2019-08-02 11:55:41 +02:00 |
|
Ivan Tashkinov
|
23d279e03e
|
[#1149] Replaced RetryQueue with oban-based retries.
|
2019-08-01 17:28:00 +03:00 |
|
Egor Kislitsyn
|
f98235f2ad
|
Clean up tests output
|
2019-08-01 16:33:36 +07:00 |
|
Egor Kislitsyn
|
9ca4506355
|
Add configurable length limits for User.bio and User.name
|
2019-08-01 15:53:37 +07:00 |
|
kaniini
|
6c06529cd4
|
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
Disallow following locked accounts over OStatus
See merge request pleroma/pleroma!1512
|
2019-07-31 19:13:56 +00:00 |
|
rinpatch
|
813c686dd7
|
Disallow following locked accounts over OStatus
|
2019-07-31 22:05:12 +03:00 |
|
Maksim
|
6eb33e7303
|
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
|
2019-07-31 18:35:15 +00:00 |
|
Ariadne Conill
|
f72e0b7cad
|
ostatus: explicitly disallow protocol downgrade from activitypub
This closes embargoed bug #1135.
|
2019-07-31 18:17:31 +00:00 |
|
rinpatch
|
301ea0dc04
|
Add tests for counters being updated on follow
|
2019-07-31 21:09:13 +03:00 |
|
Maksim
|
58443d0cd6
|
tests for TwitterApi/UtilController
|
2019-07-31 15:14:36 +00:00 |
|
lain
|
7483679a7b
|
StatusView: Return direct conversation id.
|
2019-07-31 15:12:29 +02:00 |
|
rinpatch
|
c88a5d3251
|
Merge branch 'develop' into feature/hide-follows-remote
|
2019-07-31 14:12:29 +03:00 |
|
Alexander Strizhakov
|
51b3b6d816
|
Admin changes
|
2019-07-30 16:36:05 +00:00 |
|
kaniini
|
5835069215
|
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
This reverts merge request !1504
|
2019-07-29 19:42:26 +00:00 |
|
Ariadne Conill
|
5795a890e9
|
markdown: clean up html generated by earmark
|
2019-07-29 19:09:58 +00:00 |
|
lain
|
1dfde4151c
|
Merge branch 'refactor/use-constants' into 'develop'
refactoring: begin to use constants
See merge request pleroma/pleroma!1500
|
2019-07-29 16:30:47 +00:00 |
|
Sergey Suprunenko
|
c0e258cf21
|
Redirect not logged-in users to the MastoFE login page on private instances
|
2019-07-29 16:17:22 +00:00 |
|
Maksim
|
159bbec570
|
added tests for OstatusController
|
2019-07-29 05:02:20 +00:00 |
|
Ariadne Conill
|
b93498eb52
|
constants: add as_public constant and use it everywhere
|
2019-07-29 02:43:19 +00:00 |
|
Ariadne Conill
|
492d854e7a
|
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
Closes #1104
|
2019-07-28 21:32:04 +00:00 |
|
Sachin Joshi
|
242f5c585e
|
add account confirmation email resend in mastodon api
|
2019-07-28 20:30:10 +00:00 |
|
Maksim
|
6a4b8b2681
|
fixed User.update_and_set_cache for stale user
|
2019-07-28 20:29:26 +00:00 |
|
Maksim
|
6b77a88365
|
[#1097] added redirect: /pleroma/admin -> /pleroma/admin/
|
2019-07-26 20:27:38 +00:00 |
|
rinpatch
|
41e0304757
|
Merge branch 'develop' into feature/hide-follows-remote
|
2019-07-25 18:43:30 +03:00 |
|
Maksim
|
03c386614f
|
fixed test for elixir 1.7.4
|
2019-07-25 03:43:13 +00:00 |
|
kaniini
|
19835be067
|
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
|
2019-07-24 19:29:01 +00:00 |
|
Sergey Suprunenko
|
b20020da16
|
Show the url advertised in the Activity in the Status JSON response
|
2019-07-24 19:28:21 +00:00 |
|
kPherox
|
8d9f43e1d1
|
Add WebFinger test for AP-only account
|
2019-07-25 01:27:34 +09:00 |
|
feld
|
84fca14c3c
|
Do not prepend /media/ when using base_url
This ensures admin has full control over the path where media resides.
|
2019-07-24 15:35:25 +00:00 |
|
Mike Verdone
|
0e2b5a3e6a
|
WIP
|
2019-07-24 17:25:11 +02:00 |
|
Maksim
|
55341ac717
|
tests WebFinger
|
2019-07-24 15:13:10 +00:00 |
|