aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 'feature/custom-runtime-modules'minibikini
# Conflicts: # CHANGELOG.md
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-10Change log levelEgor Kislitsyn
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-10Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0Egor Kislitsyn
2019-12-10Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn
2019-12-09docs: drop CentOS 7 install guiderinpatch
2019-12-09docs: use tabs and improve grammar in OTP install guiderinpatch
2019-12-09docs: remove overoptimistic OTP benefits and use tabs in migration from sourcerinpatch
2019-12-09docs: fix incorrect display in digest task docsrinpatch
2019-12-09Merge branch 'develop' into issue/1383Maksim Pechnikov
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
2019-12-09Update pleroma_api.mdlain
2019-12-09Merge branch 'fix/oauth-compile-time' into 'develop'lain
OAuth token cleanup: Get rid of compile-time configuration See merge request pleroma/pleroma!2044
2019-12-09Merge branch 'develop' into 'fix/oauth-compile-time'lain
# Conflicts: # CHANGELOG.md
2019-12-09Merge branch 'feature/otp-configurable-scrubbers' into 'develop'lain
HTML: Compile Scrubbers on boot See merge request pleroma/pleroma!2043
2019-12-09Changelog: Update with user timeline change info.lain
2019-12-09Set Plug.Logger to log at `:debug` levelEgor Kislitsyn
2019-12-09Set Logger level to :info in prodEgor Kislitsyn
2019-12-09Add Pleroma.Utils.compile_dir/1Egor Kislitsyn
2019-12-09Merge branch 'feat/docs-otp-source-picker' into 'develop'rinpatch
docs: add OTP/From source tabs to CLI tasks See merge request pleroma/pleroma!2046
2019-12-09Merge branch 'move-api-docs' into 'develop'rinpatch
Document `with_move` parameter of the notification API See merge request pleroma/pleroma!2047
2019-12-09Beginnings of the create validatorlain
2019-12-09Document `with_move` parameter of the notification APIEgor Kislitsyn
2019-12-09docs: add OTP/From source tabs to CLI tasksrinpatch
2019-12-08update docsMaksim Pechnikov
2019-12-08update changelogMaksim Pechnikov
2019-12-08Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-12-08OTP: Fix runtime upload limit config being ignoredrinpatch
Closes #1109
2019-12-08HTML: Compile Scrubbers on bootrinpatch
This makes it possible to configure their behavior on OTP releases.
2019-12-08Merge branch 'develop' into issue/1276Maksim Pechnikov
2019-12-08OAuth token cleanup: Get rid of compile-time configurationrinpatch
2019-12-08Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-08Merge branch 'fix/clause-never-matches' into 'develop'rinpatch
Fix never matching clause See merge request pleroma/pleroma!2042
generated by cgit v1.2.3 (git 2.26.2) at 2025-05-06 21:13:09 +0000