summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-20logging: only return ISE reasons in API responses when in dev or test modeWilliam Pitcock
2019-02-20tests: fix testsWilliam Pitcock
2019-02-20logging: improve visibility into ISE errorsWilliam Pitcock
2019-02-20Merge branch 'feature/reports' into 'develop'kaniini
Reports Closes #83 See merge request pleroma/pleroma!701
2019-02-20ReportsEgor
2019-02-20Merge branch 'nicer-share-urls' into 'develop'kaniini
Add some nicer urls in status view. See merge request pleroma/pleroma!844
2019-02-20Add some nicer urls in status view.lain
2019-02-20Merge branch '468_oauth2_scopes' into 'develop'lambda
[#468] OAuth2 scopes Closes #468 See merge request pleroma/pleroma!799
2019-02-20[#468] Added support for `push` OAuth scope (Mastodon 2.4+).Ivan Tashkinov
2019-02-20[#468] Merged `upstream/develop`.Ivan Tashkinov
2019-02-20Merge branch 'muting' into 'develop'lambda
Implement muting, add it to the whole mastodon API See merge request pleroma/pleroma!319
2019-02-20Add test for User.mutes and so on.lain
2019-02-20Add test for muting functionality.lain
2019-02-20Remove superfluous migration.lain
2019-02-20[#468] Adjusted scope restriction for MastodonAPIController#index.Ivan Tashkinov
2019-02-20[#468] More OAuth scopes-specific tests.Ivan Tashkinov
2019-02-19Merge branch 'set-activation-status-admin-api' into 'develop'kaniini
Added admin API for changing user activation status See merge request pleroma/pleroma!843
2019-02-19Update the mute implementation to the current codebaseEkaterina Vaartis
Make it part of the info thing (and do a migration to ensure it's there)
2019-02-19[#468] Added OAuth scopes-specific tests.Ivan Tashkinov
2019-02-19Remove unused "muted" parameter, use piping for mute/block fnsEkaterina Vaartis
2019-02-19Do not unfollow muted usersEkaterina Vaartis
2019-02-19Add test for mastodon muting endpointsEkaterina Vaartis
2019-02-19Implement mastodon mutes endpointEkaterina Vaartis
Aparently i forgot to add it, it gets a list of muted users
2019-02-19Implement muting, add it to the mastodon APIEkaterina Vaartis
2019-02-19Player: allow styles on CSP, loop videoshref
2019-02-19CSP: Allow iframes on embed playerhref
2019-02-19Merge branch 'develop' into fix/twittercardsMark Felder
2019-02-19Embed player suitable for Twitter Cardshref
2019-02-19Added admin API for changing user activation statuseugenijm
2019-02-19[#468] Merged `upstream/develop`.Ivan Tashkinov
2019-02-19Merge branch 'set-cache-on-user-tag-update' into 'develop'lambda
Update user cache when user tags are updated See merge request pleroma/pleroma!840
2019-02-19Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'lambda
properly check for follower address in is_private? See merge request pleroma/pleroma!841
2019-02-19Merge branch 'fix/ap_id-unique_constraint' into 'develop'lambda
mark ap_id unique_constraint See merge request pleroma/pleroma!842
2019-02-19mark ap_id unique_constraintrinpatch
2019-02-19properly check for follower address in is_private?rinpatch
2019-02-19Update user cache when user tags are updatedeugenijm
2019-02-18Merge branch 'feature/jobs' into 'develop'kaniini
Job Queue See merge request pleroma/pleroma!732
2019-02-18Merge branch 'patch-image-description' into 'develop'kaniini
Patch to support image descriptions for pleroma-fe See merge request pleroma/pleroma!626
2019-02-18Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'kaniini
Add OAuth tokens endpoint See merge request pleroma/pleroma!805
2019-02-18Merge branch 'features/flavour-switching' into 'develop'kaniini
[MastoAPI] Add switching of frontend flavours See merge request pleroma/pleroma!807
2019-02-18Merge branch 'follow-request-count' into 'develop'kaniini
Follow request count See merge request pleroma/pleroma!817
2019-02-18Merge branch 'csv-export' into 'develop'kaniini
Add option to return all friends in twitter api. Closes #602 See merge request pleroma/pleroma!833
2019-02-18Fix testMaxim Filippov
2019-02-17Render only "id", "valid_until" and "app_name" in TokenViewMaxim Filippov
2019-02-17Merge branch 'docs/add-clients-to-ex_doc' into 'develop'lambda
mix.exs: Add docs/Clients.md to docs.extras See merge request pleroma/pleroma!835
2019-02-17Merge branch 'develop' into 'docs/add-clients-to-ex_doc'lambda
# Conflicts: # mix.exs
2019-02-17Merge branch 'docker-speedup' into 'develop'lambda
Docker speedup See merge request pleroma/pleroma!837
2019-02-17Merge branch 'mastoapi-stop-capping-attachments' into 'develop'lambda
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon See merge request pleroma/pleroma!834
2019-02-17Update Differences-in-MastodonAPI-Responses.mdlambda
2019-02-17Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'lambda
Fix recipient count in hellthread policy See merge request pleroma/pleroma!836