4079d66f00
Expose issue via failing test
5 years ago
404a9ccb9a
Stats: return status counts by scope
5 years ago
38ad407395
Merge branch 'hide-followers-count' into 'develop'
...
Hide follower counter when hiding is activated
Closes #1450
See merge request pleroma/pleroma!2072
5 years ago
8f79f433bc
Hide follower counter when hiding is activated
5 years ago
804b961d3c
Merge branch 'fix/remove-useless-sleep' into 'develop'
...
Remove useless sleeping/reduce it
See merge request pleroma/pleroma!2069
5 years ago
e659fbfbf9
Merge branch 'kocaptcha-default-endpoint' into 'develop'
...
Add default endpoint to Pleroma.Captcha.Kocaptcha
See merge request pleroma/pleroma!2070
5 years ago
fc484e5ce6
Add Kocaptcha endpoint to config.exs
5 years ago
8d242f52d4
Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha"
...
This reverts commit 82c62c5028
5 years ago
82c62c5028
Add default endpoint to Pleroma.Captcha.Kocaptcha
5 years ago
eae65e3216
formatting
5 years ago
6ffbfdeeb2
tests: significantly reduce streamer timeout
...
there is no reason IPC between two processes on the same node should
take 4 seconds
5 years ago
54029fe212
tests: remove a useless sleep in rate limiter tests
...
It was used to check that authenticated and unauthenticated users have
different limits. Instead of sleeping a super low limit for
unauthenticated users was set, preventing them from doing 5 requests in
the first place.
5 years ago
137a3d220b
tests: remove a useless 1 second sleep
...
there is no need to wait for the task to finish, it will be deleted
when the transaction is aborted anyway.
5 years ago
814a99c80f
tests: remove a useless 3 second sleep
...
the ids favs use are accurate down to a microsecond, there is no need
for it
5 years ago
c8046e1080
tests: Replace 2 second sleep with offseting updated_at
5 years ago
8efacfed67
Merge branch 'feature/federation-job-insert-connection-checkout' into 'develop'
...
Publisher: check out a connection for inserting publish_one jobs
See merge request pleroma/pleroma!2063
5 years ago
bcd16676a7
Publisher: check out a connection for inserting publish_one jobs
...
Related to #1474 , federation of one post on my istance creates in
best-case 360 jobs, so if they for some reason take a while to insert,
it will exhaust the connection pool. This fixes it by checking out one
dedicated connection for inserting them.
5 years ago
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
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
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
Maxim Filippov