Age | Commit message (Collapse) | Author | |
---|---|---|---|
2019-12-12 | Add native captcha and enable it by default. | Egor Kislitsyn | |
2019-12-12 | Merge branch 'revert-bca1512d' into 'develop' | lain | |
Revert "Merge branch 'admin-scope-support-code' into 'develop'" See merge request pleroma/pleroma!2059 | |||
2019-12-12 | Revert "Merge branch 'admin-scope-support-code' into 'develop'" | lain | |
This reverts merge request !2055 | |||
2019-12-12 | Merge branch 'test-timeout' into 'develop' | lain | |
Fix intermittent failures in federated testing See merge request pleroma/pleroma!2058 | |||
2019-12-12 | Merge 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-12 | Remove runtime modules config example | Egor Kislitsyn | |
2019-12-11 | Merge branch 'feature/report-notes' into 'develop' | feld | |
AdminAPI: Add report notes See merge request pleroma/pleroma!2031 | |||
2019-12-12 | Merge branch 'develop' into feature/report-notes | Maxim Filippov | |
2019-12-11 | Merge 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-11 | Document the favorites timeline order change | Mark Felder | |
2019-12-11 | Merge branch 'develop' into issue/1411 | Mark Felder | |
2019-12-11 | try local sheduling | stwf | |
2019-12-11 | Benchmark env uses test database so we should be able to use test.secret.exs | Mark Felder | |
2019-12-11 | Merge branch 'chore/fast_sanitize_bump' into 'develop' | rinpatch | |
mix.lock: update fast_sanitize See merge request pleroma/pleroma!2056 | |||
2019-12-11 | mix.lock: update fast_sanitize | rinpatch | |
the new version uses html-spec compliant fragment parsing instead of just wrapping the fragment in the <body> tag. | |||
2019-12-11 | Merge branch 'admin-scope-support-code' into 'develop' | rinpatch | |
FE bundle updates: admin-fe and pleroma-fe See merge request pleroma/pleroma!2055 | |||
2019-12-11 | Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f. | Ivan Tashkinov | |
2019-12-11 | AdminAPI: Merge account views for list instance statuses | Maxim Filippov | |
2019-12-11 | Update CHANGELOG | Egor Kislitsyn | |
2019-12-11 | Set log level to debug for not important messages | Egor Kislitsyn | |
2019-12-11 | Merge branch 'domain-block-precedence' into 'develop' | rinpatch | |
make follows take precedence over domain blocks See merge request pleroma/pleroma!2019 | |||
2019-12-11 | remove single-step pipe | Sadposter | |
2019-12-11 | Merge 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-10 | Apply suggestion to lib/pleroma/user.ex | Sadposter | |
2019-12-10 | Merge 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-10 | Merge branch 'develop' into 'domain-block-precedence' | Sadposter | |
# Conflicts: # lib/pleroma/user.ex | |||
2019-12-10 | make analysis happy | Sadposter | |
2019-12-10 | format activity_pub.ex | Sadposter | |
2019-12-10 | modify SQL to include followed-but-domain-blocked activities | Sadposter | |
2019-12-10 | Do not apply http signature pipeline to the unsubscribe route | Egor Kislitsyn | |
2019-12-10 | Merge branch '1427-oauth-admin-scopes' into 'develop' | lain | |
[#1427] OAuth admin scopes Closes #1427 See merge request pleroma/pleroma!2025 | |||
2019-12-10 | Merge branch 'develop' into 'feature/custom-runtime-modules' | minibikini | |
# Conflicts: # CHANGELOG.md | |||
2019-12-10 | Merge branch 'develop' into '1427-oauth-admin-scopes' | lain | |
# Conflicts: # CHANGELOG.md | |||
2019-12-10 | Merge 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 type | Hakaba Hitoyo | |
2019-12-10 | Change log level | Egor Kislitsyn | |
2019-12-10 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1427-oauth-admin-scopes # Conflicts: # CHANGELOG.md | |||
2019-12-09 | Merge 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-09 | fix loads config variable with large value from db | Maksim Pechnikov | |
2019-12-09 | Merge 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-09 | Merge branch 'user-timelines-changelog' into 'develop' | rinpatch | |
Changelog: Update with user timeline change info. See merge request pleroma/pleroma!2049 | |||
2019-12-09 | status search: prefer the status fetched by url over other results | rinpatch | |
2019-12-10 | Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0 | Egor Kislitsyn | |
2019-12-10 | Merge branch 'develop' into feature/custom-runtime-modules | Egor Kislitsyn | |
2019-12-09 | docs: drop CentOS 7 install guide | rinpatch | |
2019-12-09 | docs: use tabs and improve grammar in OTP install guide | rinpatch | |
2019-12-09 | docs: remove overoptimistic OTP benefits and use tabs in migration from source | rinpatch | |
2019-12-09 | docs: fix incorrect display in digest task docs | rinpatch | |
2019-12-09 | Merge branch 'develop' into issue/1383 | Maksim Pechnikov | |