lambda
|
1f85c9c9c7
|
Merge branch 'feature/improve-error-logging' into 'develop'
logging: improve visibility into ISE errors
See merge request pleroma/pleroma!845
|
6 years ago |
|
William Pitcock
|
22e2ed235d
|
logging: only return ISE reasons in API responses when in dev or test mode
|
6 years ago |
|
William Pitcock
|
3ee77e95b2
|
tests: fix tests
|
6 years ago |
|
William Pitcock
|
8b08096436
|
logging: improve visibility into ISE errors
|
6 years ago |
|
kaniini
|
54f9e3d382
|
Merge branch 'feature/reports' into 'develop'
Reports
Closes #83
See merge request pleroma/pleroma!701
|
6 years ago |
|
Egor
|
bff9eb5ef7
|
Reports
|
6 years ago |
|
kaniini
|
77fb926afa
|
Merge branch 'nicer-share-urls' into 'develop'
Add some nicer urls in status view.
See merge request pleroma/pleroma!844
|
6 years ago |
|
lain
|
59c27f29c8
|
Add some nicer urls in status view.
|
6 years ago |
|
lambda
|
dff5e1e46a
|
Merge branch '468_oauth2_scopes' into 'develop'
[#468] OAuth2 scopes
Closes #468
See merge request pleroma/pleroma!799
|
6 years ago |
|
Ivan Tashkinov
|
b574d97c2e
|
[#468] Added support for `push` OAuth scope (Mastodon 2.4+).
|
6 years ago |
|
Ivan Tashkinov
|
6fe7acd58e
|
[#468] Merged `upstream/develop`.
|
6 years ago |
|
lambda
|
11b3c10c54
|
Merge branch 'muting' into 'develop'
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
|
6 years ago |
|
lain
|
4196d9af11
|
Add test for User.mutes and so on.
|
6 years ago |
|
lain
|
9ae79bb71a
|
Add test for muting functionality.
|
6 years ago |
|
lain
|
840d2c9f0b
|
Remove superfluous migration.
|
6 years ago |
|
Ivan Tashkinov
|
3ad91ec3c1
|
[#468] Adjusted scope restriction for MastodonAPIController#index.
|
6 years ago |
|
Ivan Tashkinov
|
337367d764
|
[#468] More OAuth scopes-specific tests.
|
6 years ago |
|
kaniini
|
abd0b85efd
|
Merge branch 'set-activation-status-admin-api' into 'develop'
Added admin API for changing user activation status
See merge request pleroma/pleroma!843
|
6 years ago |
|
Ekaterina Vaartis
|
5a46d37af9
|
Update the mute implementation to the current codebase
Make it part of the info thing (and do a migration to ensure it's there)
|
6 years ago |
|
Ivan Tashkinov
|
04ee877a20
|
[#468] Added OAuth scopes-specific tests.
|
6 years ago |
|
Ekaterina Vaartis
|
465b547c90
|
Remove unused "muted" parameter, use piping for mute/block fns
|
6 years ago |
|
Ekaterina Vaartis
|
092b1b1453
|
Do not unfollow muted users
|
6 years ago |
|
Ekaterina Vaartis
|
ad2cf4fd86
|
Add test for mastodon muting endpoints
|
6 years ago |
|
Ekaterina Vaartis
|
da64ea4a55
|
Implement mastodon mutes endpoint
Aparently i forgot to add it, it gets a list of muted users
|
6 years ago |
|
Ekaterina Vaartis
|
f41f017bbc
|
Implement muting, add it to the mastodon API
|
6 years ago |
|
eugenijm
|
25b9e7a8c3
|
Added admin API for changing user activation status
|
6 years ago |
|
Ivan Tashkinov
|
c0ecbf6669
|
[#468] Merged `upstream/develop`.
|
6 years ago |
|
lambda
|
1dd718e83c
|
Merge branch 'set-cache-on-user-tag-update' into 'develop'
Update user cache when user tags are updated
See merge request pleroma/pleroma!840
|
6 years ago |
|
lambda
|
f25a3f4f78
|
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'
properly check for follower address in is_private?
See merge request pleroma/pleroma!841
|
6 years ago |
|
lambda
|
f53dc5ee08
|
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
mark ap_id unique_constraint
See merge request pleroma/pleroma!842
|
6 years ago |
|
rinpatch
|
109b01a631
|
mark ap_id unique_constraint
|
6 years ago |
|
rinpatch
|
96dcacade1
|
properly check for follower address in is_private?
|
6 years ago |
|
eugenijm
|
fc35481445
|
Update user cache when user tags are updated
|
6 years ago |
|
kaniini
|
833161b5d2
|
Merge branch 'feature/jobs' into 'develop'
Job Queue
See merge request pleroma/pleroma!732
|
6 years ago |
|
kaniini
|
a39a094cda
|
Merge branch 'patch-image-description' into 'develop'
Patch to support image descriptions for pleroma-fe
See merge request pleroma/pleroma!626
|
6 years ago |
|
kaniini
|
7456338ed3
|
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
|
6 years ago |
|
kaniini
|
c23bd05737
|
Merge branch 'features/flavour-switching' into 'develop'
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
|
6 years ago |
|
kaniini
|
cd019a5927
|
Merge branch 'follow-request-count' into 'develop'
Follow request count
See merge request pleroma/pleroma!817
|
6 years ago |
|
kaniini
|
3f38a05571
|
Merge branch 'csv-export' into 'develop'
Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833
|
6 years ago |
|
Maxim Filippov
|
fd17a0cc9b
|
Fix test
|
6 years ago |
|
Maxim Filippov
|
94708d6370
|
Render only "id", "valid_until" and "app_name" in TokenView
|
6 years ago |
|
lambda
|
28a249bef2
|
Merge branch 'docs/add-clients-to-ex_doc' into 'develop'
mix.exs: Add docs/Clients.md to docs.extras
See merge request pleroma/pleroma!835
|
6 years ago |
|
lambda
|
a2f4fc49fe
|
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
# Conflicts:
# mix.exs
|
6 years ago |
|
lambda
|
79e503b3f5
|
Merge branch 'docker-speedup' into 'develop'
Docker speedup
See merge request pleroma/pleroma!837
|
6 years ago |
|
lambda
|
f26582aae9
|
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon
See merge request pleroma/pleroma!834
|
6 years ago |
|
lambda
|
6a8a8e90da
|
Update Differences-in-MastodonAPI-Responses.md
|
6 years ago |
|
lambda
|
ae84af4ad0
|
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
|
6 years ago |
|
lain
|
71c8c60ded
|
More speedup, test fixes.
|
6 years ago |
|
rinpatch
|
d0a94f98e0
|
more tests for HellthreadPolicy
|
6 years ago |
|
Ivan Tashkinov
|
d3fe2c8ec6
|
[#468] Formatting fix.
|
6 years ago |
