Egor Kislitsyn
|
987e0b8be8
|
Move update_credentials to MastodonAPI.AccountController
|
2019-09-30 19:10:56 +07:00 |
|
Egor Kislitsyn
|
c0ce2d5faf
|
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
|
2019-09-30 19:10:55 +07:00 |
|
Egor Kislitsyn
|
122cc050ab
|
Move account_lists test to MastodonAPI.AccountControllerTest
|
2019-09-30 19:10:55 +07:00 |
|
Egor Kislitsyn
|
38db4878a4
|
Disable async in DomainBlockControllerTest
|
2019-09-30 19:10:55 +07:00 |
|
Egor Kislitsyn
|
3c5ecb70b4
|
Add PleromaAPI.AccountController
|
2019-09-30 19:10:55 +07:00 |
|
Egor Kislitsyn
|
e7aef27c00
|
Fix merge
|
2019-09-30 19:10:54 +07:00 |
|
Egor Kislitsyn
|
1207e88195
|
Fix ReportControllerTest
|
2019-09-30 18:30:10 +07:00 |
|
kaniini
|
0e356cc800
|
Merge branch 'split-masto-api/reports' into 'develop'
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
|
2019-09-30 11:17:30 +00:00 |
|
kaniini
|
74d8fadf37
|
Merge branch 'split-masto-api/conversations' into 'develop'
Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743
|
2019-09-30 10:49:40 +00:00 |
|
Egor Kislitsyn
|
b7f27a4f58
|
Extract report actions from MastodonAPIController to ReportController
Update MastodonAPI.ReportView
|
2019-09-30 17:44:10 +07:00 |
|
Ariadne Conill
|
b7877e9b1c
|
mastodon api: implement rendering of listen activities
|
2019-09-30 10:39:17 +00:00 |
|
Egor Kislitsyn
|
d4d88b3361
|
Extract conversation actions from MastodonAPIController to ConversationController
|
2019-09-30 16:52:07 +07:00 |
|
rinpatch
|
e9d1aa75d5
|
Revert subscription refactoring.
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984.
|
2019-09-29 18:43:27 +03:00 |
|
kaniini
|
6d74a7528c
|
Merge branch 'feature/follow-requests-count' into 'develop'
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
|
2019-09-29 11:44:31 +00:00 |
|
Maksim Pechnikov
|
1053319cd6
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
2019-09-28 10:36:04 +03:00 |
|
Haelwenn (lanodan) Monnier
|
9202904da9
|
status_controller.ex: Posting media status without content defined
|
2019-09-28 01:53:41 +02:00 |
|
rinpatch
|
374f83d29b
|
Fix not being able to post empty statuses with attachments
Attachment field was filled in after the empty status check
|
2019-09-28 01:58:06 +03:00 |
|
kaniini
|
92d08d4113
|
Merge branch 'split-masto-api/follow-requests' into 'develop'
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
See merge request pleroma/pleroma!1730
|
2019-09-27 07:54:54 +00:00 |
|
kaniini
|
68bf99baf2
|
Merge branch 'split-masto-api/domain-blocks' into 'develop'
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729
|
2019-09-27 07:54:08 +00:00 |
|
kaniini
|
27a3221d57
|
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728
|
2019-09-27 07:53:22 +00:00 |
|
Egor Kislitsyn
|
408750b94e
|
Extract domain blocks actions from MastodonAPIController to DomainBlockController
|
2019-09-27 14:28:05 +07:00 |
|
Egor Kislitsyn
|
99c5a35890
|
Extract follow requests actions from MastodonAPIController to FollowRequestController
|
2019-09-27 14:25:17 +07:00 |
|
Egor Kislitsyn
|
0a5b106ddd
|
Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController
|
2019-09-27 13:36:28 +07:00 |
|
Egor Kislitsyn
|
621377f378
|
Extract filter actions from MastodonAPIController to FilterController
|
2019-09-27 13:06:25 +07:00 |
|
kaniini
|
91e2bcf218
|
Merge branch 'refactor/status-controller' into 'develop'
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
|
2019-09-27 04:37:48 +00:00 |
|
Ariadne Conill
|
14294243a2
|
mastodon api: implement follow_requests_count
|
2019-09-27 04:22:40 +00:00 |
|
Egor Kislitsyn
|
5ea5c58a85
|
Move view logic from StatusController.context to StatusView and add a test
|
2019-09-27 10:52:47 +07:00 |
|
Egor Kislitsyn
|
76b7e5cd5b
|
Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest
|
2019-09-27 10:52:47 +07:00 |
|
kaniini
|
eb9aa7aa10
|
Merge branch 'refactor/subscription' into 'develop'
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
|
2019-09-27 03:51:24 +00:00 |
|
Egor Kislitsyn
|
98d1347a4e
|
Extract status actions from MastodonAPIController into StatusController
|
2019-09-27 10:51:15 +07:00 |
|
Maksim Pechnikov
|
3d722dc200
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
2019-09-26 16:16:30 +03:00 |
|
Roman Chvanikov
|
b4b147000c
|
Merge develop
|
2019-09-26 10:38:54 +03:00 |
|
Egor Kislitsyn
|
3572cf29b7
|
Extract timeline actions from MastodonAPIController into TimelineController
|
2019-09-26 10:53:42 +07:00 |
|
kaniini
|
6abe12dced
|
Merge branch 'refactor/notification-controller' into 'develop'
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
|
2019-09-26 03:13:22 +00:00 |
|
kaniini
|
48a82c4609
|
Merge branch 'refactor/user' into 'develop'
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
|
2019-09-26 03:00:38 +00:00 |
|
|
|
5fb72170a7
|
Revert "add _discoverable_ keyword into ActivityPub @context"
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
|
2019-09-26 02:57:41 +00:00 |
|
Egor Kislitsyn
|
209395c7e6
|
Add User.change_info/2 and User.update_info/2
|
2019-09-24 19:50:07 +07:00 |
|
Egor Kislitsyn
|
a66a7a328f
|
Extract notification actions from MastodonAPIController into NotificationController
|
2019-09-24 15:16:44 +07:00 |
|
Maksim Pechnikov
|
d75d0ae134
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
2019-09-24 08:06:04 +03:00 |
|
kaniini
|
19263f30c3
|
Merge branch 'support-rel-ugc' into 'develop'
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
|
2019-09-23 22:41:31 +00:00 |
|
Maksim Pechnikov
|
494bb6bac6
|
updated tests
|
2019-09-23 22:37:30 +03:00 |
|
Maksim Pechnikov
|
179fa32dd5
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
2019-09-23 21:41:57 +03:00 |
|
eugenijm
|
7cf1252455
|
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public)
|
2019-09-20 18:27:00 +03:00 |
|
Ivan Tashkinov
|
6f67aed3ac
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
|
2019-09-19 10:59:09 +03:00 |
|
Egor Kislitsyn
|
95c948110c
|
Add rel="ugc" to hashtags and mentions
|
2019-09-19 14:56:10 +07:00 |
|
Egor Kislitsyn
|
cf3041220a
|
Add support for rel="ugc"
|
2019-09-19 14:56:10 +07:00 |
|
eugenijm
|
fe5e0b7846
|
Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses)
|
2019-09-19 08:59:25 +03:00 |
|
rinpatch
|
b0ec82d24a
|
Merge branch 'chores/bump-copyright-year' into 'develop'
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
|
2019-09-18 21:57:49 +00:00 |
|
Haelwenn (lanodan) Monnier
|
447514dfa2
|
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
2019-09-18 23:21:11 +02: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 |
|
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 |
|
Egor Kislitsyn
|
ca88e37a8f
|
Fix a race condition in tests
|
2019-09-16 12:55:05 +07: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Egor Kislitsyn
|
b40b10b53d
|
Add an endpoint to get multiple statuses by IDs
|
2019-09-10 13:39:45 +07:00 |
|
Maksim Pechnikov
|
ab2f21e470
|
tests for mastodon_api_controller.ex
|
2019-09-06 21:50:00 +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 |
|
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
|
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
|
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
|
90c2dae9a4
|
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
|
2019-08-31 10:20:34 +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 |
|
kPherox
|
eb75ea502d
|
Update test for custom fields when content-type urlencoded
|
2019-08-26 16:55:26 +09:00 |
|
kPherox
|
b8777b01ae
|
Update test for custom fields when name empty string
|
2019-08-26 03:30:31 +09:00 |
|
kPherox
|
45e21a9df4
|
Rename fields to fields_attributes
|
2019-08-25 07:34:11 +09:00 |
|
lain
|
efb8818e9e
|
Activity Expiration: Switch to 'expires_in' system.
|
2019-08-24 17:22:48 +02:00 |
|
lain
|
cc6c0b4ba6
|
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
|
2019-08-24 15:48:33 +02: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
|
85bd8a4e31
|
fixed clear config after test
|
2019-08-21 21:24:35 +03: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 |
|
Maksim
|
a320358703
|
added test helpers to clear config after tests
|
2019-08-19 15:34:29 +00: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 |
|
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 |
|
lain
|
560dbad538
|
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
|
2019-08-14 15:30:40 +02: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
|
d6094b405d
|
Fix tests
|
2019-08-14 14:52:54 +07:00 |
|
