Maksim Pechnikov
|
1053319cd6
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
9202904da9
|
status_controller.ex: Posting media status without content defined
|
5 years ago |
|
rinpatch
|
374f83d29b
|
Fix not being able to post empty statuses with attachments
Attachment field was filled in after the empty status check
|
5 years ago |
|
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
|
5 years ago |
|
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
|
5 years ago |
|
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
|
5 years ago |
|
Egor Kislitsyn
|
408750b94e
|
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
|
5 years ago |
|
Egor Kislitsyn
|
99c5a35890
|
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
|
5 years ago |
|
Egor Kislitsyn
|
0a5b106ddd
|
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
|
5 years ago |
|
Egor Kislitsyn
|
621377f378
|
Extract filter actions from `MastodonAPIController` to `FilterController`
|
5 years ago |
|
kaniini
|
91e2bcf218
|
Merge branch 'refactor/status-controller' into 'develop'
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
|
5 years ago |
|
Egor Kislitsyn
|
5ea5c58a85
|
Move view logic from StatusController.context to StatusView and add a test
|
5 years ago |
|
Egor Kislitsyn
|
76b7e5cd5b
|
Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest
|
5 years ago |
|
kaniini
|
eb9aa7aa10
|
Merge branch 'refactor/subscription' into 'develop'
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
|
5 years ago |
|
Egor Kislitsyn
|
98d1347a4e
|
Extract status actions from `MastodonAPIController` into `StatusController`
|
5 years ago |
|
Maksim Pechnikov
|
3d722dc200
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
5 years ago |
|
Roman Chvanikov
|
b4b147000c
|
Merge develop
|
5 years ago |
|
Egor Kislitsyn
|
3572cf29b7
|
Extract timeline actions from `MastodonAPIController` into `TimelineController`
|
5 years ago |
|
kaniini
|
6abe12dced
|
Merge branch 'refactor/notification-controller' into 'develop'
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
|
5 years ago |
|
kaniini
|
48a82c4609
|
Merge branch 'refactor/user' into 'develop'
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
|
5 years ago |
|
Hakaba Hitoyo
|
5fb72170a7
|
Revert "add _discoverable_ keyword into ActivityPub @context"
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
|
5 years ago |
|
Egor Kislitsyn
|
209395c7e6
|
Add User.change_info/2 and User.update_info/2
|
5 years ago |
|
Egor Kislitsyn
|
a66a7a328f
|
Extract notification actions from `MastodonAPIController` into `NotificationController`
|
5 years ago |
|
Maksim Pechnikov
|
d75d0ae134
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
5 years ago |
|
kaniini
|
19263f30c3
|
Merge branch 'support-rel-ugc' into 'develop'
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
|
5 years ago |
|
Maksim Pechnikov
|
494bb6bac6
|
updated tests
|
5 years ago |
|
Maksim Pechnikov
|
179fa32dd5
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
5 years ago |
|
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`)
|
5 years ago |
|
Egor Kislitsyn
|
95c948110c
|
Add `rel="ugc"` to hashtags and mentions
|
5 years ago |
|
Egor Kislitsyn
|
cf3041220a
|
Add support for `rel="ugc"`
|
5 years ago |
|
eugenijm
|
fe5e0b7846
|
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
|
5 years ago |
|
rinpatch
|
b0ec82d24a
|
Merge branch 'chores/bump-copyright-year' into 'develop'
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
|
5 years ago |
|
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/'
|
5 years ago |
|
eugenijm
|
450bf7a63c
|
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
|
5 years ago |
|
Roman Chvanikov
|
6042e21b25
|
Move subscription notifications to a separate controller
|
5 years ago |
|
Roman Chvanikov
|
76c3e290fc
|
Merge develop
|
5 years ago |
|
Egor Kislitsyn
|
ca88e37a8f
|
Fix a race condition in tests
|
5 years ago |
|
Ivan Tashkinov
|
610236d6be
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
|
5 years ago |
|
Roman Chvanikov
|
d7457c9165
|
Merge branch 'develop' into refactor/subscription
|
5 years ago |
|
Ivan Tashkinov
|
6bcedb693c
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
|
5 years ago |
|
rinpatch
|
a78a7ee455
|
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
|
5 years ago |
|
rinpatch
|
85b6144ffd
|
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
|
5 years ago |
|
rinpatch
|
5c5ebd3861
|
Mastodon API: Respect post privacy in favourited/reblogged endpoints
|
5 years ago |
|
stwf
|
25a64a4aa0
|
Capture test error messages where appropriate
|
5 years ago |
|
Roman Chvanikov
|
0bd2b85edb
|
Separate Subscription Notifications from regular Notifications
|
5 years ago |
|
Maksim Pechnikov
|
bc3e8c033b
|
fix formatting
|
5 years ago |
|
Maksim Pechnikov
|
ec5aaf5bd7
|
fix tests
|
5 years ago |
|
Maksim Pechnikov
|
d8a178274b
|
fix Activity.get_by_id
|
5 years ago |
|
Maksim
|
58b17196fa
|
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
|
5 years ago |
|
Egor Kislitsyn
|
b40b10b53d
|
Add an endpoint to get multiple statuses by IDs
|
5 years ago |
