aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-17Merge branch 'ci/rum-testing-no-recompilation' into 'develop'rinpatch
CI: Add a cache policy for test jobs and fix rum tests recompiling everything See merge request pleroma/pleroma!2074
2019-12-17CI: Add a cache policy for test jobs and fix rum tests recompilingrinpatch
everything
2019-12-17Add ActivityPub Object Event type supportThomas Citharel
Adds Event support in the same way Video objects are handled, with the name of the object as message header. Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17Add support for `account_id` param to filter notifications by the accountEgor Kislitsyn
2019-12-17Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhostMaxim Filippov
2019-12-17Merge branch 'hide-followers-count' into 'develop'Haelwenn
Hide follower counter when hiding is activated Closes #1450 See merge request pleroma/pleroma!2072
2019-12-17Hide follower counter when hiding is activatedEgor Kislitsyn
2019-12-17Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2019-12-17Fix typoEgor Kislitsyn
2019-12-16Apply suggestion to CHANGELOG.mdminibikini
2019-12-16Apply suggestion to test/plugs/http_signature_plug_test.exsminibikini
2019-12-16Merge branch 'fix/remove-useless-sleep' into 'develop'lain
Remove useless sleeping/reduce it See merge request pleroma/pleroma!2069
2019-12-16Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn
2019-12-16Add an option to require fetches to be signedEgor Kislitsyn
2019-12-16Merge branch 'kocaptcha-default-endpoint' into 'develop'rinpatch
Add default endpoint to Pleroma.Captcha.Kocaptcha See merge request pleroma/pleroma!2070
2019-12-16Add Kocaptcha endpoint to config.exsEgor Kislitsyn
2019-12-16Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha"Egor Kislitsyn
This reverts commit 82c62c5028f517ded121b46b9806053989defdc2.
2019-12-16Add default endpoint to Pleroma.Captcha.KocaptchaEgor Kislitsyn
2019-12-16formattingrinpatch
2019-12-16tests: significantly reduce streamer timeoutrinpatch
there is no reason IPC between two processes on the same node should take 4 seconds
2019-12-16tests: remove a useless sleep in rate limiter testsrinpatch
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-16tests: remove a useless 1 second sleeprinpatch
there is no need to wait for the task to finish, it will be deleted when the transaction is aborted anyway.
2019-12-16tests: remove a useless 3 second sleeprinpatch
the ids favs use are accurate down to a microsecond, there is no need for it
2019-12-16tests: Replace 2 second sleep with offseting updated_atrinpatch
2019-12-15OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵Ivan Tashkinov
controller tests modification: OAuth scopes usage.
2019-12-14Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-14Merge branch 'release/1.1.7' into 'stable'v1.1.7rinpatch
Release/1.1.7 See merge request pleroma/pleroma!2065
2019-12-14Disable rate limiter for socket/localhost (unless RemoteIp is enabled)Maxim Filippov
2019-12-13Don't log when users or objects are deleted.Phil Hagelberg
2019-12-13remove a random testrinpatch
it's was already removed from develop in 4e535209172bb5460353fe011c06d127cfaa5847
2019-12-13Add Kocaptcha endpoint to the test configrinpatch
2019-12-13.gitlab-ci.yml: bump rum postgres to non-bugged version and disablerinpatch
--trace
2019-12-13mix.exs: bump version to 1.1.7rinpatch
2019-12-13changelog: add entry for bundled pleroma-fe changes on 1.1.7rinpatch
2019-12-13pleroma-fe bundle: update to 36910935727ad75616a60bfb4a1622df6a686b7brinpatch
2019-12-13changelog: entry for 1.1.7rinpatch
2019-12-13Add native captcha and enable it by default.Egor Kislitsyn
2019-12-13report federating status in nodeinfohref
2019-12-13Set better Cache-Control header for static contentrinpatch
Closes #1382
2019-12-13OTP releases: only set name and distribution type if not set alreadyrinpatch
Fixes not being able to run two OTP releases on one machine because of the name conflict.
2019-12-13OTP: Fix runtime upload limit config being ignoredrinpatch
Closes #1109
2019-12-13Merge branch 'feature/federation-job-insert-connection-checkout' into 'develop'Haelwenn
Publisher: check out a connection for inserting publish_one jobs See merge request pleroma/pleroma!2063
2019-12-13Publisher: check out a connection for inserting publish_one jobsrinpatch
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-13Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn
2019-12-12Merge branch 'feature/native-captcha' into 'develop'lain
Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060
2019-12-12Merge branch 'uguu' into 'develop'lain
Update frontend See merge request pleroma/pleroma!2062
2019-12-12Update frontendlain
2019-12-12Merge branch '1427-oauth-graceful-admin-scope' into 'develop'lain
[#1427] Graceful clearance of OAuth admin scopes for non-admin users Closes #1427 See merge request pleroma/pleroma!2061
2019-12-12[#1427] Graceful clearance of OAuth admin scopes for non-admin users (no ↵Ivan Tashkinov
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-12Add Kocaptcha endpoint to the test configEgor Kislitsyn