summaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2019-12-11Merge branch 'develop' into issue/1411Mark Felder
2019-12-11Merge branch 'domain-block-precedence' into 'develop'rinpatch
make follows take precedence over domain blocks See merge request pleroma/pleroma!2019
2019-12-11[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.Ivan Tashkinov
2019-12-10Merge branch 'develop' into 'domain-block-precedence'Sadposter
# Conflicts: # lib/pleroma/user.ex
2019-12-10make analysis happySadposter
2019-12-10modify SQL to include followed-but-domain-blocked activitiesSadposter
2019-12-10Merge branch 'develop' into 'feature/custom-runtime-modules'minibikini
# Conflicts: # CHANGELOG.md
2019-12-10Merge branch 'develop' into '1427-oauth-admin-scopes'lain
# Conflicts: # CHANGELOG.md
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-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-09status search: prefer the status fetched by url over other resultsrinpatch
2019-12-10Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn
2019-12-09Merge branch 'develop' into issue/1383Maksim Pechnikov
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-08Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-12-08Merge branch 'develop' into issue/1276Maksim Pechnikov
2019-12-08Merge branch 'develop' into issue/1383Maksim Pechnikov
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-08Fix testMaxim 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
Feature/1455 chat character limit Closes #1455 See merge request pleroma/pleroma!2034
2019-12-06ActivityPub: For user timelines, respects blocks.lain
Unless the timeline belongs to a blocked user.
2019-12-06Add a test for custom runtime modulesEgor Kislitsyn
2019-12-06Fix incorrect report countMaxim Filippov
2019-12-06init tag feedMaksim Pechnikov
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
2019-12-05Validators: Add a type for the datetime used in AP.lain
2019-12-05Merge branch 'develop' into issue/1276Maksim 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-04fix ScheduledActivityMaksim Pechnikov
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex
2019-12-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodellain
2019-12-04added testMaksim Pechnikov
2019-12-04Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/1455-chat-character-limit
2019-12-04fix testMaksim Pechnikov
2019-12-04ChatChannel: Ignore messages that are too long.lain
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 01:00:37 +0000