aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-12-12Merge branch '1427-oauth-graceful-admin-scope' into 'develop'lain
2019-12-12[#1427] Graceful clearance of OAuth admin scopes for non-admin users (no erro...Ivan Tashkinov
2019-12-12Merge branch 'revert-bca1512d' into 'develop'lain
2019-12-12Revert "Merge branch 'admin-scope-support-code' into 'develop'"lain
2019-12-12Merge branch 'test-timeout' into 'develop'lain
2019-12-12Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'lain
2019-12-11Merge branch 'feature/report-notes' into 'develop'feld
2019-12-12Merge branch 'develop' into feature/report-notesMaxim Filippov
2019-12-11Merge branch 'issue/1411' into 'develop'feld
2019-12-11Document the favorites timeline order changeMark Felder
2019-12-11Merge branch 'develop' into issue/1411Mark Felder
2019-12-11try local shedulingstwf
2019-12-11Merge branch 'chore/fast_sanitize_bump' into 'develop'rinpatch
2019-12-11mix.lock: update fast_sanitizerinpatch
2019-12-11Merge branch 'admin-scope-support-code' into 'develop'rinpatch
2019-12-11Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.Ivan Tashkinov
2019-12-11AdminAPI: Merge account views for list instance statusesMaxim Filippov
2019-12-11Merge branch 'domain-block-precedence' into 'develop'rinpatch
2019-12-11remove single-step pipeSadposter
2019-12-11Merge branch '1427-oauth-admin-scopes' into 'develop'lain
2019-12-11[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.Ivan Tashkinov
2019-12-10Apply suggestion to lib/pleroma/user.exSadposter
2019-12-10Merge branch 'fix/unsubscribe-route' into 'develop'feld
2019-12-10Merge branch 'develop' into 'domain-block-precedence'Sadposter
2019-12-10make analysis happySadposter
2019-12-10format activity_pub.exSadposter
2019-12-10modify SQL to include followed-but-domain-blocked activitiesSadposter
2019-12-10Do not apply http signature pipeline to the unsubscribe routeEgor Kislitsyn
2019-12-10Merge branch '1427-oauth-admin-scopes' into 'develop'lain
2019-12-10Merge branch 'develop' into '1427-oauth-admin-scopes'lain
2019-12-10Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop'lain
2019-12-10[ActivityPub] Configurable ActivityPub actor typeHakaba Hitoyo
2019-12-10Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin...Ivan Tashkinov
2019-12-09Merge branch 'fix/load_config' into 'develop'rinpatch
2019-12-09fix loads config variable with large value from dbMaksim Pechnikov
2019-12-09Merge branch 'fix/prefer-url-over-search' into 'develop'rinpatch
2019-12-09Merge branch 'user-timelines-changelog' into 'develop'rinpatch
2019-12-09status search: prefer the status fetched by url over other resultsrinpatch
2019-12-09Merge branch 'fix/otp-parsers' into 'develop'lain
2019-12-09Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'lain
2019-12-09Merge branch 'fix/user-list-task' into 'develop'lain
2019-12-09Merge branch 'issue/1342' into 'develop'lain
2019-12-09Update pleroma_api.mdlain
2019-12-09Merge branch 'fix/oauth-compile-time' into 'develop'lain
2019-12-09Merge branch 'develop' into 'fix/oauth-compile-time'lain
2019-12-09Merge branch 'feature/otp-configurable-scrubbers' into 'develop'lain
2019-12-09Changelog: Update with user timeline change info.lain
2019-12-09Merge branch 'feat/docs-otp-source-picker' into 'develop'rinpatch
2019-12-09Merge branch 'move-api-docs' into 'develop'rinpatch
2019-12-09Document `with_move` parameter of the notification APIEgor Kislitsyn
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 09:12:56 +0000