summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-22OpenLDAP supportlink0ff
2019-02-22Move visibility into own module.lain
2019-02-22Merge branch 'oauth2_scopes_migration_hotfix' into 'develop'href
Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope` Closes #660 See merge request pleroma/pleroma!853
2019-02-22Fix private post card handling.lain
2019-02-22Fixed `scopes` of apps / authorizations / tokens from apps initially created ↵Ivan Tashkinov
with space-delimited `scope`.
2019-02-22Minor setting name adjustment (:app_template -> :app_layout).Ivan Tashkinov
2019-02-22Merge branch 'fix/twittercards' into 'develop'kaniini
Fix Twitter Cards See merge request pleroma/pleroma!815
2019-02-22Merge branch 'bugfix/outbox-bomb-on-empty-activities' into 'develop'kaniini
Fix: Fixing an outbox related bug when local user activity is empty See merge request pleroma/pleroma!849
2019-02-22Fix: Fixing an outbox related bug when local user activity is emptyKZ
2019-02-21Auth customization support.Ivan Tashkinov
OAuthController#create_authorization user retrieval / creation, errors handling, template & layout selection.
2019-02-21Merge branch 'bugfix/httpsig-sign-date' into 'develop'lambda
activitypub: sign date header Closes #649 and #364 See merge request pleroma/pleroma!847
2019-02-21Merge branch 'bugfix/as2-accept-json' into 'develop'lambda
accept application/json mimetype for fetching AS2 objects See merge request pleroma/pleroma!846
2019-02-21Merge branch '2019-02-21-update-frontend' into 'develop'lambda
update frontend See merge request pleroma/pleroma!850
2019-02-21update frontendlain
2019-02-21activitypub: sign http date headerWilliam Pitcock
2019-02-21mix: add timex dependencyWilliam Pitcock
2019-02-20tests: fix formattingWilliam Pitcock
2019-02-20fix fetching AP objects with application/jsonWilliam Pitcock
2019-02-20tests: add test for fetching AP objects with application/json.William Pitcock
2019-02-20Merge branch 'feature/improve-error-logging' into 'develop'lambda
logging: improve visibility into ISE errors See merge request pleroma/pleroma!845
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