aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-11Merge branch '1427-oauth-admin-scopes' into 'develop'lain
[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests Closes #1427 See merge request pleroma/pleroma!2053
2019-12-11[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.Ivan Tashkinov
2019-12-10Merge branch 'fix/unsubscribe-route' into 'develop'feld
Do not apply http signature pipeline to the unsubscribe route See merge request pleroma/pleroma!2052
2019-12-10Do not apply http signature pipeline to the unsubscribe routeEgor Kislitsyn
2019-12-10Merge branch '1427-oauth-admin-scopes' into 'develop'lain
[#1427] OAuth admin scopes Closes #1427 See merge request pleroma/pleroma!2025
2019-12-10Merge branch 'develop' into '1427-oauth-admin-scopes'lain
# Conflicts: # CHANGELOG.md
2019-12-10Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop'lain
[ActivityPub] Configurable ActivityPub actor type See merge request pleroma/pleroma!2005
2019-12-10[ActivityPub] Configurable ActivityPub actor typeHakaba Hitoyo
2019-12-10Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1427-oauth-admin-scopes # Conflicts: # CHANGELOG.md
2019-12-09Merge branch 'fix/load_config' into 'develop'rinpatch
fixed loads a config variable with large value from db See merge request pleroma/pleroma!2051
2019-12-09fix loads config variable with large value from dbMaksim Pechnikov
2019-12-09Merge branch 'fix/prefer-url-over-search' into 'develop'rinpatch
status search: prefer the status fetched by url over other results See merge request pleroma/pleroma!2050
2019-12-09Merge branch 'user-timelines-changelog' into 'develop'rinpatch
Changelog: Update with user timeline change info. See merge request pleroma/pleroma!2049
2019-12-09status search: prefer the status fetched by url over other resultsrinpatch
2019-12-09Merge branch 'fix/otp-parsers' into 'develop'lain
OTP: Fix runtime upload limit config being ignored Closes #1109 See merge request pleroma/pleroma!2045
2019-12-09Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'lain
Fix exclude_visibilities filter for followers-only Like notifications See merge request pleroma/pleroma!1957
2019-12-09Merge branch 'fix/user-list-task' into 'develop'lain
Fix `mix pleroma.user list` task See merge request pleroma/pleroma!2029
2019-12-09Merge branch 'issue/1342' into 'develop'lain
[#1342] Added privacy option to push notifications See merge request pleroma/pleroma!1920
2019-12-09Update pleroma_api.mdlain
2019-12-09Merge branch 'fix/oauth-compile-time' into 'develop'lain
OAuth token cleanup: Get rid of compile-time configuration See merge request pleroma/pleroma!2044
2019-12-09Merge branch 'develop' into 'fix/oauth-compile-time'lain
# Conflicts: # CHANGELOG.md
2019-12-09Merge branch 'feature/otp-configurable-scrubbers' into 'develop'lain
HTML: Compile Scrubbers on boot See merge request pleroma/pleroma!2043
2019-12-09Changelog: Update with user timeline change info.lain
2019-12-09Merge branch 'feat/docs-otp-source-picker' into 'develop'rinpatch
docs: add OTP/From source tabs to CLI tasks See merge request pleroma/pleroma!2046
2019-12-09Merge branch 'move-api-docs' into 'develop'rinpatch
Document `with_move` parameter of the notification API See merge request pleroma/pleroma!2047
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
Closes #1109
2019-12-08HTML: Compile Scrubbers on bootrinpatch
This makes it possible to configure their behavior on OTP releases.
2019-12-08OAuth token cleanup: Get rid of compile-time configurationrinpatch
2019-12-08Merge branch 'fix/clause-never-matches' into 'develop'rinpatch
Fix never matching clause See merge request pleroma/pleroma!2042
2019-12-08Fix never matching clauserinpatch
`length/1` is only used with lists.
2019-12-08Merge branch 'improve-move-notificaions-api' into 'develop'rinpatch
Add `with_move` query param to the notifications API See merge request pleroma/pleroma!2032
2019-12-08Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'rinpatch
ActivityPub: For user timelines, respects blocks. Closes #1463 See merge request pleroma/pleroma!2041
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
Feature/1455 chat character limit Closes #1455 See merge request pleroma/pleroma!2034
2019-12-06[#1427] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API ↵Ivan Tashkinov
documentation entry.
2019-12-06Merge branch 'fix/mrf-delete' into 'develop'lain
ActivityPub: Fix deletes being exempt from MRF Closes #1461 See merge request pleroma/pleroma!2037
2019-12-06ActivityPub: For user timelines, respects blocks.lain
Unless the timeline belongs to a blocked user.
2019-12-06Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1427-oauth-admin-scopes
2019-12-06[#1427] Reworked admin scopes support.Ivan Tashkinov
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
2019-12-06Merge branch 'develop' into fix/mrf-deleterinpatch
2019-12-05ActivityPub: Fix deletes being exempt from MRFrinpatch
Closes #1461
2019-12-05Merge branch '1335-user-api-id-fields-relations' into 'develop'lain
[#1335] User: refactoring of AP ID fields into relations Closes #1335 See merge request pleroma/pleroma!1963
2019-12-05Merge branch 'feature/admin-api-render-whole-status' into 'develop'feld
Miscellaneous grouped reports fixes Closes admin-fe#48 and admin-fe#51 See merge request pleroma/pleroma!2007
2019-12-05Merge branch 'develop' into issue/1342Maksim Pechnikov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-26 21:59:44 +0000