Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,310 Commits 1 Branch 0 Tags 222 MiB
f1218a2b4e
Commit Graph

11310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules 2019-12-16 22:34:21 +07:00
Egor Kislitsyn
a12b6454bb
Add an option to require fetches to be signed 2019-12-16 22:24:03 +07:00
rinpatch
e659fbfbf9 Merge branch 'kocaptcha-default-endpoint' into 'develop' 
Add default endpoint to Pleroma.Captcha.Kocaptcha

See merge request pleroma/pleroma!2070
 2019-12-16 13:08:00 +00:00
Egor Kislitsyn
fc484e5ce6
Add Kocaptcha endpoint to config.exs 2019-12-16 19:35:10 +07:00
Egor Kislitsyn
8d242f52d4
Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha" 
This reverts commit 82c62c5028.
 2019-12-16 19:33:51 +07:00
Egor Kislitsyn
82c62c5028
Add default endpoint to Pleroma.Captcha.Kocaptcha 2019-12-16 15:32:33 +07:00
rinpatch
eae65e3216 formatting 2019-12-16 01:37:33 +03:00
rinpatch
6ffbfdeeb2 tests: significantly reduce streamer timeout 
there is no reason IPC between two processes on the same node should
take 4 seconds
 2019-12-16 01:22:01 +03:00
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.
 2019-12-16 01:03:13 +03:00
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.
 2019-12-16 00:51:59 +03:00
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
 2019-12-16 00:50:39 +03:00
rinpatch
c8046e1080 tests: Replace 2 second sleep with offseting updated_at 2019-12-16 00:50:15 +03:00
Ivan Tashkinov
7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage. 2019-12-15 22:32:42 +03:00
Maksim Pechnikov
67cb46e15d Merge branch 'develop' into issue/1383 2019-12-14 21:44:10 +03:00
rinpatch
ecb3386f93 Merge branch 'release/1.1.7' into 'stable' 
Release/1.1.7

See merge request pleroma/pleroma!2065
 2019-12-14 15:01:09 +00:00
Maxim Filippov
eb11c60289 Disable rate limiter for socket/localhost (unless RemoteIp is enabled) 2019-12-14 03:06:43 +03:00
Phil Hagelberg
02c3031e99 Don't log when users or objects are deleted. 2019-12-13 12:05:53 -08:00
rinpatch
3b407a9a29 remove a random test 
it's was already removed from develop in 4e53520917
 2019-12-13 22:47:39 +03:00
rinpatch
3ecdd13bb2 Add Kocaptcha endpoint to the test config 2019-12-13 22:24:26 +03:00
rinpatch
703e5829dd .gitlab-ci.yml: bump rum postgres to non-bugged version and disable 
--trace
 2019-12-13 22:15:08 +03:00
rinpatch
f38fb42e30 mix.exs: bump version to 1.1.7 2019-12-13 22:09:14 +03:00
rinpatch
ec6cc876bc changelog: add entry for bundled pleroma-fe changes on 1.1.7 2019-12-13 22:08:45 +03:00
rinpatch
f393975123 pleroma-fe bundle: update to 36910935727ad75616a60bfb4a1622df6a686b7b 2019-12-13 22:03:24 +03:00
rinpatch
9fad30f553 changelog: entry for 1.1.7 2019-12-13 21:58:06 +03:00
Egor Kislitsyn
bf9d631fca Add native captcha and enable it by default. 2019-12-13 21:30:11 +03:00
href
865cd2c7c4 report federating status in nodeinfo 2019-12-13 21:20:09 +03:00
rinpatch
66563f93fd Set better Cache-Control header for static content 
Closes #1382
 2019-12-13 21:19:55 +03:00
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.
 2019-12-13 21:16:45 +03:00
rinpatch
2199d15000 OTP: Fix runtime upload limit config being ignored 
Closes #1109
 2019-12-13 21:16:26 +03:00
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
 2019-12-13 14:58:35 +00:00
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.
 2019-12-13 14:27:10 +03:00
Egor Kislitsyn
7528322f83 Merge branch 'develop' into feature/custom-runtime-modules 2019-12-13 01:51:52 +07:00
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
 2019-12-12 18:43:21 +00:00
lain
8ad6d2784c Merge branch 'uguu' into 'develop' 
Update frontend

See merge request pleroma/pleroma!2062
 2019-12-12 16:40:39 +00:00
lain
756a029edf Update frontend 2019-12-12 17:05:22 +01:00
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
 2019-12-12 13:26:39 +00:00
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.
 2019-12-12 16:00:06 +03:00
Egor Kislitsyn
470a3a678d Add Kocaptcha endpoint to the test config 2019-12-12 18:04:52 +07:00
Egor Kislitsyn
e536796984 Add native captcha and enable it by default. 2019-12-12 17:39:39 +07:00
lain
79532a7f7c Merge branch 'revert-bca1512d' into 'develop' 
Revert "Merge branch 'admin-scope-support-code' into 'develop'"

See merge request pleroma/pleroma!2059
 2019-12-12 09:46:16 +00:00
lain
2792672793 Revert "Merge branch 'admin-scope-support-code' into 'develop'" 
This reverts merge request !2055
 2019-12-12 09:37:02 +00:00
lain
68a667a465 Merge branch 'test-timeout' into 'develop' 
Fix intermittent failures in federated testing

See merge request pleroma/pleroma!2058
 2019-12-12 09:31:50 +00:00
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
 2019-12-12 09:28:27 +00:00
Egor Kislitsyn
c6f2735ffa Remove runtime modules config example 2019-12-12 14:37:57 +07:00
feld
2aa609db8a Merge branch 'feature/report-notes' into 'develop' 
AdminAPI: Add report notes

See merge request pleroma/pleroma!2031
 2019-12-11 23:45:44 +00:00
Maxim Filippov
3ecf131511 Merge branch 'develop' into feature/report-notes 2019-12-12 02:16:23 +03:00
feld
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
 2019-12-11 22:37:16 +00:00
Mark Felder
0867064441 Document the favorites timeline order change 2019-12-11 15:03:54 -06:00
Mark Felder
9ef912aecf Merge branch 'develop' into issue/1411 2019-12-11 15:02:53 -06:00
stwf
63ffa0e3ed try local sheduling 2019-12-11 14:57:33 -05:00