2f31cef71f
Merge branch 'feature/native-captcha' into 'develop'
...
Add native captcha and enable it by default.
Closes #1017 and #1405
See merge request pleroma/pleroma!2060
5 years ago
8ad6d2784c
Merge branch 'uguu' into 'develop'
...
Update frontend
See merge request pleroma/pleroma!2062
5 years ago
756a029edf
Update frontend
5 years ago
f44794d273
Merge branch '1427-oauth-graceful-admin-scope' into 'develop'
...
[#1427 ] Graceful clearance of OAuth admin scopes for non-admin users
Closes #1427
See merge request pleroma/pleroma!2061
5 years ago
81b05340e9
[ #1427 ] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
...
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
5 years ago
470a3a678d
Add Kocaptcha endpoint to the test config
5 years ago
e536796984
Add native captcha and enable it by default.
5 years ago
79532a7f7c
Merge branch 'revert-bca1512d' into 'develop'
...
Revert "Merge branch 'admin-scope-support-code' into 'develop'"
See merge request pleroma/pleroma!2059
5 years ago
2792672793
Revert "Merge branch 'admin-scope-support-code' into 'develop'"
...
This reverts merge request !2055
5 years ago
68a667a465
Merge branch 'test-timeout' into 'develop'
...
Fix intermittent failures in federated testing
See merge request pleroma/pleroma!2058
5 years ago
8cb852523a
Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
...
AdminAPI: Merge account views for list instance statuses
See merge request pleroma/pleroma!2054
5 years ago
c6f2735ffa
Remove runtime modules config example
5 years ago
2aa609db8a
Merge branch 'feature/report-notes' into 'develop'
...
AdminAPI: Add report notes
See merge request pleroma/pleroma!2031
5 years ago
3ecf131511
Merge branch 'develop' into feature/report-notes
5 years ago
fd697cf209
Merge branch 'issue/1411' into 'develop'
...
[#1411 ] /api/v1/favourites: added sorting for activites by adds to favorites
See merge request pleroma/pleroma!1991
5 years ago
0867064441
Document the favorites timeline order change
5 years ago
9ef912aecf
Merge branch 'develop' into issue/1411
5 years ago
63ffa0e3ed
try local sheduling
5 years ago
92b4a1aa1b
Merge branch 'chore/fast_sanitize_bump' into 'develop'
...
mix.lock: update fast_sanitize
See merge request pleroma/pleroma!2056
5 years ago
c01b39579d
mix.lock: update fast_sanitize
...
the new version uses html-spec compliant fragment parsing instead of
just wrapping the fragment in the <body> tag.
5 years ago
bca1512dae
Merge branch 'admin-scope-support-code' into 'develop'
...
FE bundle updates: admin-fe and pleroma-fe
See merge request pleroma/pleroma!2055
5 years ago
84f0aec9aa
Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.
5 years ago
82fae3e23f
AdminAPI: Merge account views for list instance statuses
5 years ago
1a6e30d32e
Update CHANGELOG
5 years ago
ee6805850c
Set log level to debug for not important messages
5 years ago
72f3b22134
Merge branch 'domain-block-precedence' into 'develop'
...
make follows take precedence over domain blocks
See merge request pleroma/pleroma!2019
5 years ago
1ad96d667a
remove single-step pipe
5 years ago
1f498ba2bb
Merge branch '1427-oauth-admin-scopes' into 'develop'
...
[#1427 ] Fixed `:admin` option handling in OAuthScopesPlug, added tests
Closes #1427
See merge request pleroma/pleroma!2053
5 years ago
3920244be5
[ #1427 ] Fixed `:admin` option handling in OAuthScopesPlug, added tests.
5 years ago
457821adb0
Apply suggestion to lib/pleroma/user.ex
5 years ago
67a478d709
Merge branch 'fix/unsubscribe-route' into 'develop'
...
Do not apply http signature pipeline to the unsubscribe route
See merge request pleroma/pleroma!2052
5 years ago
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
5abee19b63
make analysis happy
5 years ago
25f774f7c1
format activity_pub.ex
5 years ago
19d228cc58
modify SQL to include followed-but-domain-blocked activities
5 years ago
75b419d7c8
Do not apply http signature pipeline to the unsubscribe route
5 years ago
aac0187ec1
Merge branch '1427-oauth-admin-scopes' into 'develop'
...
[#1427 ] OAuth admin scopes
Closes #1427
See merge request pleroma/pleroma!2025
5 years ago
43d9c06a2a
Merge branch 'develop' into 'feature/custom-runtime-modules'
...
# Conflicts:
# CHANGELOG.md
5 years ago
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
5 years ago
54b1b2c9c0
Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop'
...
[ActivityPub] Configurable ActivityPub actor type
See merge request pleroma/pleroma!2005
5 years ago
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
a37bd5c255
Change log level
5 years ago
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
5 years ago
99623b4eca
Merge branch 'fix/load_config' into 'develop'
...
fixed loads a config variable with large value from db
See merge request pleroma/pleroma!2051
5 years ago
9dfaa0b832
fix loads config variable with large value from db
5 years ago
37c34ccec3
Merge branch 'fix/prefer-url-over-search' into 'develop'
...
status search: prefer the status fetched by url over other results
See merge request pleroma/pleroma!2050
5 years ago
632dab5d30
Merge branch 'user-timelines-changelog' into 'develop'
...
Changelog: Update with user timeline change info.
See merge request pleroma/pleroma!2049
5 years ago
f4b7f32d51
status search: prefer the status fetched by url over other results
5 years ago
b7a57d8e38
Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0
5 years ago
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
lain