Commit Graph

7827 Commits (81b05340e9291e9af11727aee77f2c70a9d73498)
 

Author SHA1 Message Date
Ivan Tashkinov 81b05340e9 [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
5 years ago
lain 79532a7f7c Merge branch 'revert-bca1512d' into 'develop'
5 years ago
lain 2792672793 Revert "Merge branch 'admin-scope-support-code' into 'develop'"
5 years ago
lain 68a667a465 Merge branch 'test-timeout' into 'develop'
5 years ago
lain 8cb852523a Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
5 years ago
feld 2aa609db8a Merge branch 'feature/report-notes' into 'develop'
5 years ago
Maxim Filippov 3ecf131511 Merge branch 'develop' into feature/report-notes
5 years ago
feld fd697cf209 Merge branch 'issue/1411' into 'develop'
5 years ago
Mark Felder 0867064441 Document the favorites timeline order change
5 years ago
Mark Felder 9ef912aecf Merge branch 'develop' into issue/1411
5 years ago
stwf 63ffa0e3ed try local sheduling
5 years ago
rinpatch 92b4a1aa1b Merge branch 'chore/fast_sanitize_bump' into 'develop'
5 years ago
rinpatch c01b39579d mix.lock: update fast_sanitize
5 years ago
rinpatch bca1512dae Merge branch 'admin-scope-support-code' into 'develop'
5 years ago
Ivan Tashkinov 84f0aec9aa Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.
5 years ago
Maxim Filippov 82fae3e23f AdminAPI: Merge account views for list instance statuses
5 years ago
rinpatch 72f3b22134 Merge branch 'domain-block-precedence' into 'develop'
5 years ago
Sadposter 1ad96d667a remove single-step pipe
5 years ago
lain 1f498ba2bb Merge branch '1427-oauth-admin-scopes' into 'develop'
5 years ago
Ivan Tashkinov 3920244be5 [#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.
5 years ago
Sadposter 457821adb0 Apply suggestion to lib/pleroma/user.ex
5 years ago
feld 67a478d709 Merge branch 'fix/unsubscribe-route' into 'develop'
5 years ago
Sadposter 8cfaab8f04 Merge branch 'develop' into 'domain-block-precedence'
5 years ago
Sadposter 5abee19b63 make analysis happy
5 years ago
Sadposter 25f774f7c1 format activity_pub.ex
5 years ago
Sadposter 19d228cc58 modify SQL to include followed-but-domain-blocked activities
5 years ago
Egor Kislitsyn 75b419d7c8 Do not apply http signature pipeline to the unsubscribe route
5 years ago
lain aac0187ec1 Merge branch '1427-oauth-admin-scopes' into 'develop'
5 years ago
lain 1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes'
5 years ago
lain 54b1b2c9c0 Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop'
5 years ago
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type
5 years ago
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
5 years ago
rinpatch 99623b4eca Merge branch 'fix/load_config' into 'develop'
5 years ago
Maksim Pechnikov 9dfaa0b832 fix loads config variable with large value from db
5 years ago
rinpatch 37c34ccec3 Merge branch 'fix/prefer-url-over-search' into 'develop'
5 years ago
rinpatch 632dab5d30 Merge branch 'user-timelines-changelog' into 'develop'
5 years ago
rinpatch f4b7f32d51 status search: prefer the status fetched by url over other results
5 years ago
lain 0d2c13a119 Merge branch 'fix/otp-parsers' into 'develop'
5 years ago
lain b3c80b8404 Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
5 years ago
lain f3c2363f4a Merge branch 'fix/user-list-task' into 'develop'
5 years ago
lain e4ea0e20b3 Merge branch 'issue/1342' into 'develop'
5 years ago
lain 4692919ea6 Update pleroma_api.md
5 years ago
lain 8d2ca85cea Merge branch 'fix/oauth-compile-time' into 'develop'
5 years ago
lain a5e28bf214 Merge branch 'develop' into 'fix/oauth-compile-time'
5 years ago
lain 49110f0498 Merge branch 'feature/otp-configurable-scrubbers' into 'develop'
5 years ago
lain eb7f412b26 Changelog: Update with user timeline change info.
5 years ago
rinpatch 990cd7ef5d Merge branch 'feat/docs-otp-source-picker' into 'develop'
5 years ago
rinpatch 1e2bb450db Merge branch 'move-api-docs' into 'develop'
5 years ago
Egor Kislitsyn b4027e7187 Document `with_move` parameter of the notification API
5 years ago
rinpatch eb9ea8475b docs: add OTP/From source tabs to CLI tasks
5 years ago