Mark Felder [Wed, 11 Dec 2019 18:52:57 +0000 (12:52 -0600)]
Benchmark env uses test database so we should be able to use test.secret.exs
rinpatch [Wed, 11 Dec 2019 17:57:41 +0000 (17:57 +0000)]
Merge branch 'chore/fast_sanitize_bump' into 'develop'
mix.lock: update fast_sanitize
See merge request pleroma/pleroma!2056
rinpatch [Wed, 11 Dec 2019 17:42:08 +0000 (20:42 +0300)]
mix.lock: update fast_sanitize
the new version uses html-spec compliant fragment parsing instead of
just wrapping the fragment in the <body> tag.
rinpatch [Wed, 11 Dec 2019 17:38:16 +0000 (17:38 +0000)]
Merge branch 'admin-scope-support-code' into 'develop'
FE bundle updates: admin-fe and pleroma-fe
See merge request pleroma/pleroma!2055
Ivan Tashkinov [Wed, 11 Dec 2019 16:48:00 +0000 (19:48 +0300)]
Updated admin-fe bundle to
14cdc4a, pleroma-fe bundle to
abb6747f.
rinpatch [Wed, 11 Dec 2019 09:57:00 +0000 (09:57 +0000)]
Merge branch 'domain-block-precedence' into 'develop'
make follows take precedence over domain blocks
See merge request pleroma/pleroma!2019
Sadposter [Wed, 11 Dec 2019 09:08:20 +0000 (09:08 +0000)]
remove single-step pipe
lain [Wed, 11 Dec 2019 08:50:43 +0000 (08:50 +0000)]
Merge branch '1427-oauth-admin-scopes' into 'develop'
[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests
Closes #1427
See merge request pleroma/pleroma!2053
Ivan Tashkinov [Wed, 11 Dec 2019 08:42:02 +0000 (11:42 +0300)]
[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.
Sadposter [Tue, 10 Dec 2019 18:49:41 +0000 (18:49 +0000)]
Apply suggestion to lib/pleroma/user.ex
feld [Tue, 10 Dec 2019 17:25:56 +0000 (17:25 +0000)]
Merge branch 'fix/unsubscribe-route' into 'develop'
Do not apply http signature pipeline to the unsubscribe route
See merge request pleroma/pleroma!2052
Sadposter [Tue, 10 Dec 2019 16:54:25 +0000 (16:54 +0000)]
Merge branch 'develop' into 'domain-block-precedence'
# Conflicts:
# lib/pleroma/user.ex
Sadposter [Tue, 10 Dec 2019 16:50:58 +0000 (16:50 +0000)]
make analysis happy
Sadposter [Tue, 10 Dec 2019 16:41:43 +0000 (16:41 +0000)]
format activity_pub.ex
Sadposter [Tue, 10 Dec 2019 16:40:12 +0000 (16:40 +0000)]
modify SQL to include followed-but-domain-blocked activities
Egor Kislitsyn [Tue, 10 Dec 2019 14:46:02 +0000 (21:46 +0700)]
Do not apply http signature pipeline to the unsubscribe route
lain [Tue, 10 Dec 2019 13:44:06 +0000 (13:44 +0000)]
Merge branch '1427-oauth-admin-scopes' into 'develop'
[#1427] OAuth admin scopes
Closes #1427
See merge request pleroma/pleroma!2025
lain [Tue, 10 Dec 2019 13:34:54 +0000 (13:34 +0000)]
Merge branch 'develop' into '1427-oauth-admin-scopes'
# Conflicts:
# CHANGELOG.md
lain [Tue, 10 Dec 2019 13:19:26 +0000 (13:19 +0000)]
Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop'
[ActivityPub] Configurable ActivityPub actor type
See merge request pleroma/pleroma!2005
Hakaba Hitoyo [Tue, 10 Dec 2019 13:19:26 +0000 (13:19 +0000)]
[ActivityPub] Configurable ActivityPub actor type
Ivan Tashkinov [Tue, 10 Dec 2019 05:55:14 +0000 (08:55 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
# CHANGELOG.md
rinpatch [Mon, 9 Dec 2019 20:35:05 +0000 (20:35 +0000)]
Merge branch 'fix/load_config' into 'develop'
fixed loads a config variable with large value from db
See merge request pleroma/pleroma!2051
Maksim Pechnikov [Mon, 9 Dec 2019 19:29:44 +0000 (22:29 +0300)]
fix loads config variable with large value from db
rinpatch [Mon, 9 Dec 2019 17:55:48 +0000 (17:55 +0000)]
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
rinpatch [Mon, 9 Dec 2019 17:50:00 +0000 (17:50 +0000)]
Merge branch 'user-timelines-changelog' into 'develop'
Changelog: Update with user timeline change info.
See merge request pleroma/pleroma!2049
rinpatch [Mon, 9 Dec 2019 17:45:04 +0000 (20:45 +0300)]
status search: prefer the status fetched by url over other results
lain [Mon, 9 Dec 2019 15:10:05 +0000 (15:10 +0000)]
Merge branch 'fix/otp-parsers' into 'develop'
OTP: Fix runtime upload limit config being ignored
Closes #1109
See merge request pleroma/pleroma!2045
lain [Mon, 9 Dec 2019 14:55:42 +0000 (14:55 +0000)]
Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
Fix exclude_visibilities filter for followers-only Like notifications
See merge request pleroma/pleroma!1957
lain [Mon, 9 Dec 2019 14:44:56 +0000 (14:44 +0000)]
Merge branch 'fix/user-list-task' into 'develop'
Fix `mix pleroma.user list` task
See merge request pleroma/pleroma!2029
lain [Mon, 9 Dec 2019 14:30:35 +0000 (14:30 +0000)]
Merge branch 'issue/1342' into 'develop'
[#1342] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
lain [Mon, 9 Dec 2019 14:15:59 +0000 (14:15 +0000)]
Update pleroma_api.md
lain [Mon, 9 Dec 2019 13:59:35 +0000 (13:59 +0000)]
Merge branch 'fix/oauth-compile-time' into 'develop'
OAuth token cleanup: Get rid of compile-time configuration
See merge request pleroma/pleroma!2044
lain [Mon, 9 Dec 2019 13:52:01 +0000 (13:52 +0000)]
Merge branch 'develop' into 'fix/oauth-compile-time'
# Conflicts:
# CHANGELOG.md
lain [Mon, 9 Dec 2019 13:51:09 +0000 (13:51 +0000)]
Merge branch 'feature/otp-configurable-scrubbers' into 'develop'
HTML: Compile Scrubbers on boot
See merge request pleroma/pleroma!2043
lain [Mon, 9 Dec 2019 13:43:57 +0000 (14:43 +0100)]
Changelog: Update with user timeline change info.
rinpatch [Mon, 9 Dec 2019 10:27:43 +0000 (10:27 +0000)]
Merge branch 'feat/docs-otp-source-picker' into 'develop'
docs: add OTP/From source tabs to CLI tasks
See merge request pleroma/pleroma!2046
rinpatch [Mon, 9 Dec 2019 10:16:26 +0000 (10:16 +0000)]
Merge branch 'move-api-docs' into 'develop'
Document `with_move` parameter of the notification API
See merge request pleroma/pleroma!2047
Egor Kislitsyn [Mon, 9 Dec 2019 07:46:06 +0000 (14:46 +0700)]
Document `with_move` parameter of the notification API
rinpatch [Mon, 9 Dec 2019 01:07:16 +0000 (04:07 +0300)]
docs: add OTP/From source tabs to CLI tasks
Maksim Pechnikov [Sun, 8 Dec 2019 19:09:15 +0000 (22:09 +0300)]
update docs
Maksim Pechnikov [Sun, 8 Dec 2019 18:46:20 +0000 (21:46 +0300)]
update changelog
Maksim Pechnikov [Sun, 8 Dec 2019 18:25:26 +0000 (21:25 +0300)]
Merge branch 'develop' into issue/1342
rinpatch [Sun, 8 Dec 2019 18:08:25 +0000 (21:08 +0300)]
OTP: Fix runtime upload limit config being ignored
Closes #1109
rinpatch [Sun, 8 Dec 2019 16:42:40 +0000 (19:42 +0300)]
HTML: Compile Scrubbers on boot
This makes it possible to configure their behavior on OTP releases.
rinpatch [Sun, 8 Dec 2019 14:36:44 +0000 (17:36 +0300)]
OAuth token cleanup: Get rid of compile-time configuration
rinpatch [Sun, 8 Dec 2019 13:50:57 +0000 (13:50 +0000)]
Merge branch 'fix/clause-never-matches' into 'develop'
Fix never matching clause
See merge request pleroma/pleroma!2042
rinpatch [Sun, 8 Dec 2019 13:36:22 +0000 (16:36 +0300)]
Fix never matching clause
`length/1` is only used with lists.
rinpatch [Sun, 8 Dec 2019 13:07:05 +0000 (13:07 +0000)]
Merge branch 'improve-move-notificaions-api' into 'develop'
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
rinpatch [Sun, 8 Dec 2019 11:23:31 +0000 (11:23 +0000)]
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
ActivityPub: For user timelines, respects blocks.
Closes #1463
See merge request pleroma/pleroma!2041
Ivan Tashkinov [Sat, 7 Dec 2019 14:49:53 +0000 (17:49 +0300)]
[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.
Ivan Tashkinov [Fri, 6 Dec 2019 17:33:47 +0000 (20:33 +0300)]
[#1427] Fixes / improvements of admin scopes support. Added tests.
rinpatch [Fri, 6 Dec 2019 15:36:30 +0000 (15:36 +0000)]
Merge branch 'feature/1455-chat-character-limit' into 'develop'
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
Ivan Tashkinov [Fri, 6 Dec 2019 13:56:23 +0000 (16:56 +0300)]
[#1427] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.
lain [Fri, 6 Dec 2019 13:48:37 +0000 (13:48 +0000)]
Merge branch 'fix/mrf-delete' into 'develop'
ActivityPub: Fix deletes being exempt from MRF
Closes #1461
See merge request pleroma/pleroma!2037
lain [Fri, 6 Dec 2019 13:25:13 +0000 (14:25 +0100)]
ActivityPub: For user timelines, respects blocks.
Unless the timeline belongs to a blocked user.
Ivan Tashkinov [Thu, 5 Dec 2019 21:26:31 +0000 (00:26 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
Ivan Tashkinov [Thu, 5 Dec 2019 21:25:44 +0000 (00:25 +0300)]
[#1427] Reworked admin scopes support.
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
rinpatch [Thu, 5 Dec 2019 21:12:21 +0000 (00:12 +0300)]
Merge branch 'develop' into fix/mrf-delete
rinpatch [Wed, 4 Dec 2019 23:50:38 +0000 (02:50 +0300)]
ActivityPub: Fix deletes being exempt from MRF
Closes #1461
lain [Thu, 5 Dec 2019 17:16:23 +0000 (17:16 +0000)]
Merge branch '1335-user-api-id-fields-relations' into 'develop'
[#1335] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
feld [Thu, 5 Dec 2019 13:34:34 +0000 (13:34 +0000)]
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
Maksim Pechnikov [Thu, 5 Dec 2019 12:46:27 +0000 (15:46 +0300)]
Merge branch 'develop' into issue/1342
Egor Kislitsyn [Thu, 5 Dec 2019 07:55:48 +0000 (14:55 +0700)]
Merge branch 'develop' into improve-move-notificaions-api
Ivan Tashkinov [Wed, 4 Dec 2019 16:41:14 +0000 (19:41 +0300)]
[#1335] Merge issue fix.
Ivan Tashkinov [Wed, 4 Dec 2019 15:56:31 +0000 (18:56 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
lain [Wed, 4 Dec 2019 13:25:12 +0000 (13:25 +0000)]
Merge branch 'fix_test' into 'develop'
[#1457] fix test
See merge request pleroma/pleroma!2035
lain [Wed, 4 Dec 2019 13:25:00 +0000 (14:25 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit
Maksim Pechnikov [Wed, 4 Dec 2019 13:22:01 +0000 (16:22 +0300)]
fix test
lain [Wed, 4 Dec 2019 11:51:06 +0000 (12:51 +0100)]
Cheat Sheet: Addg chat_limit information.
lain [Wed, 4 Dec 2019 11:49:46 +0000 (12:49 +0100)]
Changelog: Add information about chat limit.
lain [Wed, 4 Dec 2019 11:48:34 +0000 (12:48 +0100)]
ChatChannel: Ignore messages that are too long.
Egor Kislitsyn [Tue, 3 Dec 2019 15:31:12 +0000 (22:31 +0700)]
Fix Pleroma.FollowingRelationship.move_following/2
Egor Kislitsyn [Tue, 3 Dec 2019 15:13:38 +0000 (22:13 +0700)]
Add `with_move` query param to the notifications API
lain [Mon, 2 Dec 2019 16:26:19 +0000 (16:26 +0000)]
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
rinpatch [Mon, 2 Dec 2019 11:18:58 +0000 (11:18 +0000)]
Merge branch 'update-floki' into 'develop'
Update Floki dependency
See merge request pleroma/pleroma!2028
Egor Kislitsyn [Mon, 2 Dec 2019 11:11:45 +0000 (18:11 +0700)]
Fix `mix pleroma.user list` task
Egor Kislitsyn [Mon, 2 Dec 2019 06:38:35 +0000 (13:38 +0700)]
Update Floki dependency
rinpatch [Sat, 30 Nov 2019 10:42:51 +0000 (10:42 +0000)]
Merge branch 'remove-info-from-users' into 'develop'
Removed users.info field
See merge request pleroma/pleroma!2006
rinpatch [Sat, 30 Nov 2019 10:41:18 +0000 (10:41 +0000)]
Merge branch 'hide-relation-for-friendica' into 'develop'
Hide relation for friendica users
See merge request pleroma/pleroma!2026
rinpatch [Sat, 30 Nov 2019 10:39:48 +0000 (10:39 +0000)]
Merge branch 'benchmarks/favourites_timeline' into 'develop'
Benchmarks: favourites timeline
See merge request pleroma/pleroma!2027
kPherox [Sat, 30 Nov 2019 06:24:08 +0000 (15:24 +0900)]
test missing first field
kPherox [Fri, 29 Nov 2019 19:26:45 +0000 (04:26 +0900)]
hide follower/following for friendica
Ivan Tashkinov [Fri, 29 Nov 2019 15:57:19 +0000 (18:57 +0300)]
[#1427] Initial support for OAuth admin scopes.
lain [Fri, 29 Nov 2019 10:10:30 +0000 (10:10 +0000)]
Merge branch 'fix/extract_first_external_url' into 'develop'
Fix Pleroma.HTML.extract_first_external_url/2
Closes #1451
See merge request pleroma/pleroma!2024
Egor Kislitsyn [Fri, 29 Nov 2019 08:49:35 +0000 (15:49 +0700)]
Fix Pleroma.HTML.extract_first_external_url/2
Ivan Tashkinov [Fri, 29 Nov 2019 07:17:59 +0000 (10:17 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# mix.lock
rinpatch [Thu, 28 Nov 2019 19:13:42 +0000 (19:13 +0000)]
Merge branch 'bugfix/1447-set-following' into 'develop'
Migrations: Set users.following_count to NOT NULL
Closes #1447
See merge request pleroma/pleroma!2021
Maksim Pechnikov [Wed, 30 Oct 2019 19:59:04 +0000 (22:59 +0300)]
add mix task to set\unset privacy option of notification
Maksim Pechnikov [Tue, 29 Oct 2019 18:33:17 +0000 (21:33 +0300)]
added privacy option to push notifications
Maksim Pechnikov [Mon, 28 Oct 2019 09:47:23 +0000 (12:47 +0300)]
added User.NotificationSetting struct
rinpatch [Thu, 28 Nov 2019 17:46:23 +0000 (17:46 +0000)]
Merge branch 'chore/manual-benchmark' into 'develop'
CI: Make benchmarks manually triggered.
See merge request pleroma/pleroma!2020
lain [Thu, 28 Nov 2019 16:58:41 +0000 (16:58 +0000)]
Merge branch 'use-pg12-in-ci' into 'develop'
Use PosgreSQL v12 in the federated tests
See merge request pleroma/pleroma!2022
Egor Kislitsyn [Thu, 28 Nov 2019 16:08:13 +0000 (23:08 +0700)]
Use PosgreSQL v12 in the federated tests
lain [Thu, 28 Nov 2019 16:01:43 +0000 (17:01 +0100)]
Migrations: Set users.following_count to NOT NULL
Also set following_count for local users to the correct value and for remote
users to 0.
lain [Thu, 28 Nov 2019 14:34:07 +0000 (14:34 +0000)]
Merge branch 'fed-testing-updates' into 'develop'
Add federated test infrastructure
See merge request pleroma/pleroma!2014
lain [Thu, 28 Nov 2019 14:14:11 +0000 (15:14 +0100)]
CI: Make benchmarks manually triggered.
lain [Thu, 28 Nov 2019 12:19:15 +0000 (12:19 +0000)]
Merge branch 'cleanup-tests-output' into 'develop'
Cleanup tests output
See merge request pleroma/pleroma!2018
Sadposter [Thu, 28 Nov 2019 10:40:50 +0000 (10:40 +0000)]
obligatory format commit
Sadposter [Thu, 28 Nov 2019 10:38:38 +0000 (10:38 +0000)]
make follows take precedence over domain blocks
Egor Kislitsyn [Thu, 28 Nov 2019 09:44:48 +0000 (16:44 +0700)]
Cleanup tests output
projects / akkoma / log