Maksim Pechnikov
a879c396bb
Merge branch 'develop' into feature/tag_feed
5 years ago
Egor Kislitsyn
36d66d9655
Fix typo
5 years ago
minibikini
d81c3afbb2
Apply suggestion to CHANGELOG.md
5 years ago
minibikini
e1fa8c11a9
Apply suggestion to test/plugs/http_signature_plug_test.exs
5 years ago
lain
804b961d3c
Merge branch 'fix/remove-useless-sleep' into 'develop'
...
Remove useless sleeping/reduce it
See merge request pleroma/pleroma!2069
5 years ago
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Egor Kislitsyn
a12b6454bb
Add an option to require fetches to be signed
5 years ago
rinpatch
e659fbfbf9
Merge branch 'kocaptcha-default-endpoint' into 'develop'
...
Add default endpoint to Pleroma.Captcha.Kocaptcha
See merge request pleroma/pleroma!2070
5 years ago
Egor Kislitsyn
fc484e5ce6
Add Kocaptcha endpoint to config.exs
5 years ago
Egor Kislitsyn
8d242f52d4
Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha"
...
This reverts commit 82c62c5028
.
5 years ago
Egor Kislitsyn
82c62c5028
Add default endpoint to Pleroma.Captcha.Kocaptcha
5 years ago
rinpatch
eae65e3216
formatting
5 years ago
rinpatch
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
rinpatch
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
rinpatch
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
rinpatch
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
rinpatch
c8046e1080
tests: Replace 2 second sleep with offseting updated_at
5 years ago
Ivan Tashkinov
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Maksim Pechnikov
67cb46e15d
Merge branch 'develop' into issue/1383
5 years ago
rinpatch
ecb3386f93
Merge branch 'release/1.1.7' into 'stable'
...
Release/1.1.7
See merge request pleroma/pleroma!2065
5 years ago
Maxim Filippov
eb11c60289
Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
5 years ago
Phil Hagelberg
02c3031e99
Don't log when users or objects are deleted.
5 years ago
rinpatch
3b407a9a29
remove a random test
...
it's was already removed from develop in 4e53520917
5 years ago
rinpatch
3ecdd13bb2
Add Kocaptcha endpoint to the test config
5 years ago
rinpatch
703e5829dd
.gitlab-ci.yml: bump rum postgres to non-bugged version and disable
...
--trace
5 years ago
rinpatch
f38fb42e30
mix.exs: bump version to 1.1.7
5 years ago
rinpatch
ec6cc876bc
changelog: add entry for bundled pleroma-fe changes on 1.1.7
5 years ago
rinpatch
f393975123
pleroma-fe bundle: update to 36910935727ad75616a60bfb4a1622df6a686b7b
5 years ago
rinpatch
9fad30f553
changelog: entry for 1.1.7
5 years ago
Egor Kislitsyn
bf9d631fca
Add native captcha and enable it by default.
5 years ago
href
865cd2c7c4
report federating status in nodeinfo
5 years ago
rinpatch
66563f93fd
Set better Cache-Control header for static content
...
Closes #1382
5 years ago
rinpatch
b7370ab513
OTP releases: only set name and distribution type if not set already
...
Fixes not being able to run two OTP releases on one machine because of
the name conflict.
5 years ago
rinpatch
2199d15000
OTP: Fix runtime upload limit config being ignored
...
Closes #1109
5 years ago
Haelwenn
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
rinpatch
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
Egor Kislitsyn
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
lain
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
lain
8ad6d2784c
Merge branch 'uguu' into 'develop'
...
Update frontend
See merge request pleroma/pleroma!2062
5 years ago
lain
756a029edf
Update frontend
5 years ago
lain
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
Ivan Tashkinov
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
Egor Kislitsyn
470a3a678d
Add Kocaptcha endpoint to the test config
5 years ago
Egor Kislitsyn
e536796984
Add native captcha and enable it by default.
5 years ago
lain
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
lain
2792672793
Revert "Merge branch 'admin-scope-support-code' into 'develop'"
...
This reverts merge request !2055
5 years ago
lain
68a667a465
Merge branch 'test-timeout' into 'develop'
...
Fix intermittent failures in federated testing
See merge request pleroma/pleroma!2058
5 years ago
lain
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
Egor Kislitsyn
c6f2735ffa
Remove runtime modules config example
5 years ago
feld
2aa609db8a
Merge branch 'feature/report-notes' into 'develop'
...
AdminAPI: Add report notes
See merge request pleroma/pleroma!2031
5 years ago