summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2019-12-09docs: add OTP/From source tabs to CLI tasksrinpatch
2019-12-08update docsMaksim Pechnikov
2019-12-08update changelogMaksim Pechnikov
2019-12-08Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-12-08OTP: Fix runtime upload limit config being ignoredrinpatch
2019-12-08HTML: Compile Scrubbers on bootrinpatch
2019-12-08OAuth token cleanup: Get rid of compile-time configurationrinpatch
2019-12-08Merge branch 'fix/clause-never-matches' into 'develop'rinpatch
2019-12-08Fix never matching clauserinpatch
2019-12-08Merge branch 'improve-move-notificaions-api' into 'develop'rinpatch
2019-12-08Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'rinpatch
2019-12-08Fix testMaxim Filippov
2019-12-08DocsMaxim Filippov
2019-12-08Implement report notes destructionMaxim Filippov
2019-12-07[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.Ivan Tashkinov
2019-12-06[#1427] Fixes / improvements of admin scopes support. Added tests.Ivan Tashkinov
2019-12-06Merge branch 'feature/1455-chat-character-limit' into 'develop'rinpatch
2019-12-06[#1427] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation...Ivan Tashkinov
2019-12-06Merge branch 'fix/mrf-delete' into 'develop'lain
2019-12-06ActivityPub: For user timelines, respects blocks.lain
2019-12-06Fix incorrect report countMaxim Filippov
2019-12-06Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-s...Ivan Tashkinov
2019-12-06[#1427] Reworked admin scopes support.Ivan Tashkinov
2019-12-06Merge branch 'develop' into fix/mrf-deleterinpatch
2019-12-05ActivityPub: Fix deletes being exempt from MRFrinpatch
2019-12-05Merge branch '1335-user-api-id-fields-relations' into 'develop'lain
2019-12-05Merge branch 'feature/admin-api-render-whole-status' into 'develop'feld
2019-12-05Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-12-05Merge branch 'develop' into issue/1411Maksim Pechnikov
2019-12-05Merge branch 'develop' into improve-move-notificaions-apiEgor Kislitsyn
2019-12-05Add failing test, which exposes a bugMaxim Filippov
2019-12-04[#1335] Merge issue fix.Ivan Tashkinov
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-12-04Merge branch 'fix_test' into 'develop'lain
2019-12-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/145...lain
2019-12-04fix testMaksim Pechnikov
2019-12-04Cheat Sheet: Addg chat_limit information.lain
2019-12-04Changelog: Add information about chat limit.lain
2019-12-04ChatChannel: Ignore messages that are too long.lain
2019-12-03Fix Pleroma.FollowingRelationship.move_following/2Egor Kislitsyn
2019-12-04Add report notesMaxim Filippov
2019-12-03Add `with_move` query param to the notifications APIEgor Kislitsyn