summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-14Fixed UtilController.do_remote_follow/2 auth check (allowed password auth ↵remote-follow-auth-fixIvan Tashkinov
without OAuth scope check). Follower might be signed out when submitting the form and thus OAuth token may be absent.
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-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
2019-12-12Add native captcha and enable it by default.Egor Kislitsyn
2019-12-12Merge branch 'revert-bca1512d' into 'develop'lain
Revert "Merge branch 'admin-scope-support-code' into 'develop'" See merge request pleroma/pleroma!2059
2019-12-12Revert "Merge branch 'admin-scope-support-code' into 'develop'"lain
This reverts merge request !2055
2019-12-12Merge branch 'test-timeout' into 'develop'lain
Fix intermittent failures in federated testing See merge request pleroma/pleroma!2058
2019-12-12Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'lain
AdminAPI: Merge account views for list instance statuses See merge request pleroma/pleroma!2054
2019-12-11Merge branch 'feature/report-notes' into 'develop'feld
AdminAPI: Add report notes See merge request pleroma/pleroma!2031
2019-12-12Merge branch 'develop' into feature/report-notesMaxim Filippov
2019-12-11Merge branch 'issue/1411' into 'develop'feld
[#1411] /api/v1/favourites: added sorting for activites by adds to favorites See merge request pleroma/pleroma!1991
2019-12-11Document the favorites timeline order changeMark Felder
2019-12-11Merge branch 'develop' into issue/1411Mark Felder
2019-12-11try local shedulingstwf
2019-12-11Merge branch 'chore/fast_sanitize_bump' into 'develop'rinpatch
mix.lock: update fast_sanitize See merge request pleroma/pleroma!2056
2019-12-11mix.lock: update fast_sanitizerinpatch
the new version uses html-spec compliant fragment parsing instead of just wrapping the fragment in the <body> tag.
2019-12-11Merge branch 'admin-scope-support-code' into 'develop'rinpatch
FE bundle updates: admin-fe and pleroma-fe See merge request pleroma/pleroma!2055
2019-12-11Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.Ivan Tashkinov
2019-12-11AdminAPI: Merge account views for list instance statusesMaxim Filippov
2019-12-11Merge branch 'domain-block-precedence' into 'develop'rinpatch
make follows take precedence over domain blocks See merge request pleroma/pleroma!2019
2019-12-11remove single-step pipeSadposter
2019-12-11Merge branch '1427-oauth-admin-scopes' into 'develop'lain
[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests Closes #1427 See merge request pleroma/pleroma!2053
2019-12-11[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.Ivan Tashkinov
2019-12-10Apply suggestion to lib/pleroma/user.exSadposter
2019-12-10Merge branch 'fix/unsubscribe-route' into 'develop'feld
Do not apply http signature pipeline to the unsubscribe route See merge request pleroma/pleroma!2052
2019-12-10Merge branch 'develop' into 'domain-block-precedence'Sadposter
# Conflicts: # lib/pleroma/user.ex
2019-12-10make analysis happySadposter
2019-12-10format activity_pub.exSadposter
2019-12-10modify SQL to include followed-but-domain-blocked activitiesSadposter
2019-12-10Do not apply http signature pipeline to the unsubscribe routeEgor Kislitsyn
2019-12-10Merge branch '1427-oauth-admin-scopes' into 'develop'lain
[#1427] OAuth admin scopes Closes #1427 See merge request pleroma/pleroma!2025
2019-12-10Merge branch 'develop' into '1427-oauth-admin-scopes'lain
# Conflicts: # CHANGELOG.md
2019-12-10Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop'lain
[ActivityPub] Configurable ActivityPub actor type See merge request pleroma/pleroma!2005
2019-12-10[ActivityPub] Configurable ActivityPub actor typeHakaba Hitoyo
2019-12-10Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1427-oauth-admin-scopes # Conflicts: # CHANGELOG.md
2019-12-09Merge branch 'fix/load_config' into 'develop'rinpatch
fixed loads a config variable with large value from db See merge request pleroma/pleroma!2051
2019-12-09fix loads config variable with large value from dbMaksim Pechnikov
2019-12-09Merge branch 'fix/prefer-url-over-search' into 'develop'rinpatch
status search: prefer the status fetched by url over other results See merge request pleroma/pleroma!2050
2019-12-09Merge branch 'user-timelines-changelog' into 'develop'rinpatch
Changelog: Update with user timeline change info. See merge request pleroma/pleroma!2049
2019-12-09status search: prefer the status fetched by url over other resultsrinpatch
2019-12-09Merge branch 'fix/otp-parsers' into 'develop'lain
OTP: Fix runtime upload limit config being ignored Closes #1109 See merge request pleroma/pleroma!2045
2019-12-09Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'lain
Fix exclude_visibilities filter for followers-only Like notifications See merge request pleroma/pleroma!1957
2019-12-09Merge branch 'fix/user-list-task' into 'develop'lain
Fix `mix pleroma.user list` task See merge request pleroma/pleroma!2029
2019-12-09Merge branch 'issue/1342' into 'develop'lain
[#1342] Added privacy option to push notifications See merge request pleroma/pleroma!1920
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-05 14:00:12 +0000