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 |
|
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 |
|
Egor Kislitsyn
|
b40b10b53d
|
Add an endpoint to get multiple statuses by IDs
|
5 years ago |
|
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
|
5 years ago |
|
rinpatch
|
896ffabe37
|
Merge branch 'so-long-twitterapi' into 'develop'
Removing TwitterAPI
See merge request pleroma/pleroma!1605
|
5 years ago |
|
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
|
5 years ago |
|
rinpatch
|
b312ca3d52
|
Mastodon API Poll view: Fix handling of polls without an end date
|
5 years ago |
|
Ivan Tashkinov
|
79cf629e1a
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
|
rinpatch
|
3face45467
|
Mastodon API: Add `pleroma.thread_muted` to Status entity
Needed for pleroma-fe!941
|
5 years ago |
|
rinpatch
|
cc1d1ee406
|
Mastdon API: Add ability to get a remote account by nickname to
`/api/v1/accounts/:id`
|
5 years ago |
|
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
|
5 years ago |
|
rinpatch
|
90c2dae9a4
|
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
|
5 years ago |
|
Egor Kislitsyn
|
019ced0558
|
Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views
|
5 years ago |
|
Egor Kislitsyn
|
30510ade0e
|
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
|
5 years ago |
|
lain
|
efb8818e9e
|
Activity Expiration: Switch to 'expires_in' system.
|
5 years ago |
|
lain
|
cc6c0b4ba6
|
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
|
5 years ago |
|
Ivan Tashkinov
|
7101ba1a21
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
|
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
|
5 years ago |
|
Maksim Pechnikov
|
85bd8a4e31
|
fixed clear config after test
|
5 years ago |
|
lain
|
ef43016b2c
|
Merge branch 'feature/custom-fields' into 'develop'
Add custom profile fields
See merge request pleroma/pleroma!1488
|
5 years ago |
|
Maksim
|
a320358703
|
added test helpers to clear config after tests
|
5 years ago |
|
lain
|
7ab2dbbdb6
|
Merge branch 'pleroma-conversations' into 'develop'
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
|
5 years ago |
|
Ivan Tashkinov
|
8778c16dac
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
|
Ivan Tashkinov
|
a180c1360e
|
[#1149] Oban mailer job. Adjusted tests.
|
5 years ago |
|
stwf
|
d81f63845a
|
Implement Pleroma.Stats as GenServer
|
5 years ago |
|
lain
|
560dbad538
|
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
|
5 years ago |
|
Egor Kislitsyn
|
f7bbf99caa
|
Use info.fields instead of source_data for remote users
|
5 years ago |
|
Egor Kislitsyn
|
2c35d4b0b0
|
Add configurable account field name length limit
|
5 years ago |
|
Egor Kislitsyn
|
db3c05f6b4
|
Add configurable account field value length limit
|
5 years ago |
|
Egor Kislitsyn
|
d6094b405d
|
Fix tests
|
5 years ago |
|
Egor Kislitsyn
|
e0ac5c7a66
|
Add custom profile fields
|
5 years ago |
|
Maksim
|
04da1166db
|
tests for /web/mastodon_api/mastodon_api.ex
|
5 years ago |
|
lain
|
511ccea5aa
|
ConversationView: Align parameter names with other views.
|
5 years ago |
|
lain
|
23c46f7e72
|
Conversations: Use 'recipients' for accounts in conversation view.
According to gargron, this is the intended usage.
|
5 years ago |
|
kaniini
|
84808e1697
|
Merge branch 'develop' into 'fix/hide-follows-counters'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
rinpatch
|
0802a08871
|
Mastodon API: Fix thread mute detection
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
|
5 years ago |
|
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.
|
5 years ago |
|
lain
|
a2b98f6d58
|
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
|
5 years ago |
|
lain
|
d6fe220e32
|
Linting.
|
5 years ago |
|
lain
|
3af6d14da7
|
Pleroma Conversations API: Add a way to set recipients.
|
5 years ago |
|
Sergey Suprunenko
|
040347b248
|
Remove spaces from the domain search
|
5 years ago |
|
feld
|
d93d777915
|
Fix/mediaproxy whitelist base url
|
5 years ago |
|
lain
|
7483679a7b
|
StatusView: Return direct conversation id.
|
5 years ago |
|
Sergey Suprunenko
|
c0e258cf21
|
Redirect not logged-in users to the MastoFE login page on private instances
|
5 years ago |
|
Sachin Joshi
|
242f5c585e
|
add account confirmation email resend in mastodon api
|
5 years ago |
