aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Expand)Author
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-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 'develop' into 'feature/custom-runtime-modules'minibikini
2019-12-10Merge branch 'develop' into '1427-oauth-admin-scopes'lain
2019-12-10[ActivityPub] Configurable ActivityPub actor typeHakaba Hitoyo
2019-12-10Change log levelEgor Kislitsyn
2019-12-10Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin...Ivan Tashkinov
2019-12-09Merge branch 'fix/prefer-url-over-search' into 'develop'rinpatch
2019-12-09status search: prefer the status fetched by url over other resultsrinpatch
2019-12-10Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0Egor Kislitsyn
2019-12-10Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn
2019-12-09Merge branch 'develop' into issue/1383Maksim Pechnikov
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 'issue/1342' into 'develop'lain
2019-12-09Merge branch 'develop' into 'fix/oauth-compile-time'lain
2019-12-09Set Plug.Logger to log at `:debug` levelEgor Kislitsyn
2019-12-09Set Logger level to :info in prodEgor Kislitsyn
2019-12-09Add Pleroma.Utils.compile_dir/1Egor Kislitsyn
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 'develop' into issue/1383Maksim Pechnikov
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-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-06ActivityPub: For user timelines, respects blocks.lain
2019-12-06Add a test for custom runtime modulesEgor Kislitsyn
2019-12-06Fix incorrect report countMaxim Filippov
2019-12-06Use Kernel.inspect/2 to print loaded custom modulesEgor Kislitsyn
2019-12-06Move runtime configuration from `:instance` to `:modules`Egor Kislitsyn
2019-12-06init tag feedMaksim Pechnikov
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