Commit graph

8699 commits

Author SHA1 Message Date
minibikini 43d9c06a2a Merge branch 'develop' into 'feature/custom-runtime-modules'
# Conflicts:
#   CHANGELOG.md
2019-12-10 13:38:25 +00:00
lain 1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes'
# Conflicts:
#   CHANGELOG.md
2019-12-10 13:34:54 +00:00
lain 54b1b2c9c0 Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop'
[ActivityPub] Configurable ActivityPub actor type

See merge request pleroma/pleroma!2005
2019-12-10 13:19:26 +00:00
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type 2019-12-10 13:19:26 +00:00
Egor Kislitsyn a37bd5c255 Change log level 2019-12-10 15:08:57 +07:00
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
#	CHANGELOG.md
2019-12-10 08:55:14 +03:00
rinpatch 99623b4eca Merge branch 'fix/load_config' into 'develop'
fixed loads a config variable with large value from db

See merge request pleroma/pleroma!2051
2019-12-09 20:35:05 +00:00
Maksim Pechnikov 9dfaa0b832 fix loads config variable with large value from db 2019-12-09 22:29:44 +03:00
rinpatch 37c34ccec3 Merge branch 'fix/prefer-url-over-search' into 'develop'
status search: prefer the status fetched by url over other results

See merge request pleroma/pleroma!2050
2019-12-09 17:55:48 +00:00
rinpatch 632dab5d30 Merge branch 'user-timelines-changelog' into 'develop'
Changelog: Update with user timeline change info.

See merge request pleroma/pleroma!2049
2019-12-09 17:50:00 +00:00
rinpatch f4b7f32d51 status search: prefer the status fetched by url over other results 2019-12-09 20:45:04 +03:00
Egor Kislitsyn b7a57d8e38 Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0 2019-12-10 00:38:01 +07:00
Egor Kislitsyn c098dec473 Merge branch 'develop' into feature/custom-runtime-modules 2019-12-10 00:16:43 +07:00
rinpatch d237e9b11d docs: drop CentOS 7 install guide 2019-12-09 20:11:39 +03:00
rinpatch 8dbe2dfde1 docs: use tabs and improve grammar in OTP install guide 2019-12-09 20:09:47 +03:00
rinpatch 0a8b32a661 docs: remove overoptimistic OTP benefits and use tabs in migration from source 2019-12-09 20:08:31 +03:00
rinpatch b0505b2cc7 docs: fix incorrect display in digest task docs 2019-12-09 20:07:43 +03:00
Maksim Pechnikov 2b821036c4 Merge branch 'develop' into issue/1383 2019-12-09 19:41:43 +03:00
lain 0d2c13a119 Merge branch 'fix/otp-parsers' into 'develop'
OTP: Fix runtime upload limit config being ignored

Closes #1109

See merge request pleroma/pleroma!2045
2019-12-09 15:10:05 +00:00
lain b3c80b8404 Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
Fix exclude_visibilities filter for followers-only Like notifications

See merge request pleroma/pleroma!1957
2019-12-09 14:55:42 +00:00
lain f3c2363f4a Merge branch 'fix/user-list-task' into 'develop'
Fix `mix pleroma.user list` task

See merge request pleroma/pleroma!2029
2019-12-09 14:44:56 +00:00
lain e4ea0e20b3 Merge branch 'issue/1342' into 'develop'
[#1342] Added privacy option to push notifications

See merge request pleroma/pleroma!1920
2019-12-09 14:30:35 +00:00
lain 4692919ea6 Update pleroma_api.md 2019-12-09 14:15:59 +00:00
lain 8d2ca85cea Merge branch 'fix/oauth-compile-time' into 'develop'
OAuth token cleanup: Get rid of compile-time configuration

See merge request pleroma/pleroma!2044
2019-12-09 13:59:35 +00:00
lain a5e28bf214 Merge branch 'develop' into 'fix/oauth-compile-time'
# Conflicts:
#   CHANGELOG.md
2019-12-09 13:52:01 +00:00
lain 49110f0498 Merge branch 'feature/otp-configurable-scrubbers' into 'develop'
HTML: Compile Scrubbers on boot

See merge request pleroma/pleroma!2043
2019-12-09 13:51:09 +00:00
lain eb7f412b26 Changelog: Update with user timeline change info. 2019-12-09 14:43:57 +01:00
Egor Kislitsyn 78299ab182 Set Plug.Logger to log at :debug level 2019-12-09 19:12:24 +07:00
Egor Kislitsyn ed92784e7c Set Logger level to :info in prod 2019-12-09 19:11:54 +07:00
Egor Kislitsyn 84f891ea3e Add Pleroma.Utils.compile_dir/1 2019-12-09 18:23:07 +07:00
rinpatch 990cd7ef5d Merge branch 'feat/docs-otp-source-picker' into 'develop'
docs: add OTP/From source tabs to CLI tasks

See merge request pleroma/pleroma!2046
2019-12-09 10:27:43 +00:00
rinpatch 1e2bb450db Merge branch 'move-api-docs' into 'develop'
Document `with_move` parameter of the notification API

See merge request pleroma/pleroma!2047
2019-12-09 10:16:26 +00:00
Egor Kislitsyn b4027e7187 Document with_move parameter of the notification API 2019-12-09 14:46:06 +07:00
rinpatch eb9ea8475b docs: add OTP/From source tabs to CLI tasks 2019-12-09 04:07:16 +03:00
Maksim Pechnikov e260a16c05 update docs 2019-12-08 22:09:15 +03:00
Maksim Pechnikov dfae1d705f update changelog 2019-12-08 21:46:20 +03:00
Maksim Pechnikov 95e6a2acd9 Merge branch 'develop' into issue/1342 2019-12-08 21:25:26 +03:00
rinpatch 3c45ed4f47 OTP: Fix runtime upload limit config being ignored
Closes #1109
2019-12-08 21:08:25 +03:00
rinpatch d6c89068f3 HTML: Compile Scrubbers on boot
This makes it possible to configure their behavior on OTP releases.
2019-12-08 20:35:41 +03:00
rinpatch bd3aa8500c OAuth token cleanup: Get rid of compile-time configuration 2019-12-08 20:03:33 +03:00
Maksim Pechnikov 5876a9cb79 Merge branch 'develop' into issue/1383 2019-12-08 19:52:46 +03:00
rinpatch af5fef1f22 Merge branch 'fix/clause-never-matches' into 'develop'
Fix never matching clause

See merge request pleroma/pleroma!2042
2019-12-08 13:50:57 +00:00
rinpatch a21340caa1 Fix never matching clause
`length/1` is only used with lists.
2019-12-08 16:46:18 +03:00
rinpatch 8404f8c8fb Merge branch 'improve-move-notificaions-api' into 'develop'
Add `with_move` query param to the notifications API

See merge request pleroma/pleroma!2032
2019-12-08 13:07:05 +00:00
rinpatch 29a3f70cba Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
ActivityPub: For user timelines, respects blocks.

Closes #1463

See merge request pleroma/pleroma!2041
2019-12-08 11:23:31 +00:00
Maxim Filippov cc36a8ea90 Fix test 2019-12-08 11:35:38 +03:00
Maxim Filippov 00c38cf28d Docs 2019-12-08 11:29:33 +03:00
Maxim Filippov a7f77785c2 Implement report notes destruction 2019-12-08 11:27:23 +03:00
Ivan Tashkinov 1770602747 [#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests. 2019-12-07 17:49:53 +03:00
Ivan Tashkinov 40e1817f70 [#1427] Fixes / improvements of admin scopes support. Added tests. 2019-12-06 20:33:47 +03:00