Maksim Pechnikov [Tue, 21 Jan 2020 17:56:49 +0000 (20:56 +0300)]
Merge branch 'develop' into feature/tag_feed
rinpatch [Tue, 21 Jan 2020 13:13:17 +0000 (13:13 +0000)]
Merge branch 'emoji-reaction-extensions' into 'develop'
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
lain [Tue, 21 Jan 2020 13:07:07 +0000 (13:07 +0000)]
Merge branch 'issue/1484' into 'develop'
[#1484] excludes posts of blocked users from search results
Closes #1484
See merge request pleroma/pleroma!2122
Maksim Pechnikov [Tue, 21 Jan 2020 06:23:35 +0000 (09:23 +0300)]
Merge branch 'develop' into feature/tag_feed
Maksim Pechnikov [Mon, 20 Jan 2020 18:47:44 +0000 (21:47 +0300)]
exclude blocked user posts from search results
lain [Mon, 20 Jan 2020 17:10:55 +0000 (18:10 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
lain [Mon, 20 Jan 2020 17:10:23 +0000 (17:10 +0000)]
Merge branch '1521-admin-report-test-fix' into 'develop'
[#1521] AdminApiControllerTest fix: fixed create report test (OAuth)
Closes #1521
See merge request pleroma/pleroma!2121
Ivan Tashkinov [Mon, 20 Jan 2020 17:04:25 +0000 (20:04 +0300)]
[#1521] AdminApiControllerTest: fixed create report test (OAuth).
rinpatch [Mon, 20 Jan 2020 16:31:43 +0000 (16:31 +0000)]
Merge branch 'favoritng-responses' into 'develop'
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
lain [Mon, 20 Jan 2020 15:31:12 +0000 (16:31 +0100)]
Update changelog
lain [Mon, 20 Jan 2020 15:24:20 +0000 (16:24 +0100)]
StatusView: Add `emoji_reactions`
lain [Mon, 20 Jan 2020 14:42:43 +0000 (14:42 +0000)]
Merge branch 'credo/version-bump-1.1.5' into 'develop'
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
lain [Mon, 20 Jan 2020 14:31:14 +0000 (15:31 +0100)]
StatusControllerTest: Fix typo
lain [Mon, 20 Jan 2020 13:49:06 +0000 (13:49 +0000)]
Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
Pleroma API: `emoji_reactions_by` does not need authorization
See merge request pleroma/pleroma!2117
lain [Mon, 20 Jan 2020 13:27:59 +0000 (14:27 +0100)]
CommonAPI: Don't error out on double favs/repeats
lain [Mon, 20 Jan 2020 12:07:12 +0000 (12:07 +0000)]
Merge branch 'fix-admin-api-scope' into 'develop'
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
lain [Mon, 20 Jan 2020 12:05:35 +0000 (13:05 +0100)]
Pleroma API: `emoji_reactions_by` does not need authorization
Haelwenn [Mon, 20 Jan 2020 11:26:07 +0000 (11:26 +0000)]
Merge branch 'hashtag-benchmarks' into 'develop'
Hashtag benchmarks
See merge request pleroma/pleroma!2116
lain [Mon, 20 Jan 2020 11:19:15 +0000 (12:19 +0100)]
Add benchmark of any/all tag options
Haelwenn (lanodan) Monnier [Mon, 20 Jan 2020 10:53:14 +0000 (11:53 +0100)]
Bump credo to 1.1.5
rinpatch [Mon, 20 Jan 2020 10:25:17 +0000 (10:25 +0000)]
Merge branch 'features/cleanup-incoming-actor' into 'develop'
transmogrifier.ex: simplify handle_incoming of actors
See merge request pleroma/pleroma!2114
lain [Mon, 20 Jan 2020 09:56:16 +0000 (09:56 +0000)]
Merge branch 'feat/startup-migration-check' into 'develop'
Check for unapplied migrations on startup
Closes #1328
See merge request pleroma/pleroma!2112
rinpatch [Thu, 16 Jan 2020 16:01:31 +0000 (19:01 +0300)]
Check for unapplied migrations on startup
Closes #1328
rinpatch [Sun, 19 Jan 2020 10:33:46 +0000 (13:33 +0300)]
mix.lock: update mock to 0.3.4
This version adds Mock.passthrough/1 which I need to use in a test
Haelwenn (lanodan) Monnier [Sun, 19 Jan 2020 06:02:16 +0000 (07:02 +0100)]
transmogrifier.ex: simplify handle_incoming of actors
feld [Wed, 15 Jan 2020 22:52:53 +0000 (22:52 +0000)]
Merge branch 'ci/docker-imaging' into 'develop'
ci/docker imaging
See merge request pleroma/pleroma!2110
jp [Wed, 15 Jan 2020 22:25:33 +0000 (17:25 -0500)]
Update docker release / stable jobs
jp [Wed, 15 Jan 2020 21:54:53 +0000 (16:54 -0500)]
Update docker jobs for release branches and stable branches
jp [Wed, 15 Jan 2020 21:41:41 +0000 (16:41 -0500)]
Fix only: on docker develop/latest job
jp [Wed, 15 Jan 2020 21:23:43 +0000 (16:23 -0500)]
update `only:` for release/ branch regex matching. and to avoid running image builds on unnecessary forks
jp [Wed, 15 Jan 2020 21:16:29 +0000 (16:16 -0500)]
Fix odd spacing
Maksim Pechnikov [Wed, 15 Jan 2020 16:11:13 +0000 (19:11 +0300)]
Merge branch 'develop' into feature/tag_feed
lain [Wed, 15 Jan 2020 15:44:49 +0000 (15:44 +0000)]
Merge branch '1478-oauth-admin-scopes-tweaks' into 'develop'
[#1478] OAuth `admin` scopes tweaks
Closes #1478
See merge request pleroma/pleroma!2081
Ivan Tashkinov [Wed, 15 Jan 2020 15:38:18 +0000 (18:38 +0300)]
Ivan Tashkinov [Wed, 15 Jan 2020 15:12:08 +0000 (18:12 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
lain [Wed, 15 Jan 2020 14:29:56 +0000 (14:29 +0000)]
Merge branch 'develop' into 'feature/tag_feed'
# Conflicts:
# CHANGELOG.md
lain [Wed, 15 Jan 2020 14:05:22 +0000 (14:05 +0000)]
Merge branch 'notifications-from-account' into 'develop'
[#1470] Add support for `account_id` param to filter notifications by the account
See merge request pleroma/pleroma!2073
Egor Kislitsyn [Wed, 15 Jan 2020 12:51:09 +0000 (16:51 +0400)]
Fix notification controller test
Egor Kislitsyn [Wed, 15 Jan 2020 12:49:45 +0000 (16:49 +0400)]
Merge branch 'develop' into notifications-from-account
lain [Wed, 15 Jan 2020 11:37:50 +0000 (12:37 +0100)]
Benchmarks: Move to correct folder
Ivan Tashkinov [Wed, 15 Jan 2020 09:11:23 +0000 (12:11 +0300)]
[#1478] Adjusted AdminAPIController admin subscope requirements.
feld [Tue, 14 Jan 2020 21:36:52 +0000 (21:36 +0000)]
Merge branch 'features/docker-updates' into 'develop'
Features/docker updates
See merge request pleroma/pleroma!2105
jp [Tue, 14 Jan 2020 18:47:36 +0000 (13:47 -0500)]
Remove forked test branch matching
jp [Tue, 14 Jan 2020 18:45:47 +0000 (13:45 -0500)]
Remove artifacts passing by setting `dependencies: []`
Maksim Pechnikov [Tue, 14 Jan 2020 13:26:56 +0000 (16:26 +0300)]
Merge branch 'develop' into feature/tag_feed
lain [Tue, 14 Jan 2020 17:48:58 +0000 (17:48 +0000)]
Merge branch 'features/docker-updates' into 'develop'
Features/docker updates
See merge request pleroma/pleroma!2104
jp [Tue, 14 Jan 2020 17:43:28 +0000 (12:43 -0500)]
Add allow_failure to docker jobs
jp [Tue, 14 Jan 2020 17:32:36 +0000 (12:32 -0500)]
Remove cache from docker jobs. Split devlop and stable branches into their own jobs
lain [Tue, 14 Jan 2020 16:24:26 +0000 (17:24 +0100)]
Mix Tasks: Add pleroma.benchmarks.tags
lain [Tue, 14 Jan 2020 16:11:36 +0000 (16:11 +0000)]
Merge branch 'warnings-fix' into 'develop'
compilation warnings fix
See merge request pleroma/pleroma!2102
Alexander Strizhakov [Tue, 14 Jan 2020 12:49:52 +0000 (15:49 +0300)]
compilation warnings fix
lain [Mon, 13 Jan 2020 15:25:41 +0000 (15:25 +0000)]
Merge branch 'feature/ci-registry' into 'develop'
Update Dockerfile with labels. Update gitlab-ci for registry usage
See merge request pleroma/pleroma!2098
feld [Sun, 12 Jan 2020 18:48:59 +0000 (18:48 +0000)]
Merge branch 'feature/attachments-cleanup' into 'develop'
Delete attachments when status is deleted
See merge request pleroma/pleroma!2036
Roman Chvanikov [Sun, 12 Jan 2020 18:48:58 +0000 (18:48 +0000)]
Delete attachments when status is deleted
feld [Sun, 12 Jan 2020 18:37:52 +0000 (18:37 +0000)]
Merge branch 'updated-at-on-conversation-read' into 'develop'
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
feld [Sun, 12 Jan 2020 18:31:10 +0000 (18:31 +0000)]
Merge branch 'config/benchmark' into 'develop'
Benchmark env uses test database so we should be able to use test.secret.exs
See merge request pleroma/pleroma!2057
feld [Sun, 12 Jan 2020 18:20:31 +0000 (18:20 +0000)]
Merge branch 'issue/1354' into 'develop'
[#1354] fix remote follow
See merge request pleroma/pleroma!2079
Mark Felder [Sun, 12 Jan 2020 18:14:09 +0000 (12:14 -0600)]
Assign token that can write to follows
Mark Felder [Sun, 12 Jan 2020 18:12:15 +0000 (12:12 -0600)]
Merge branch 'develop' into issue/1354
feld [Sun, 12 Jan 2020 17:25:25 +0000 (17:25 +0000)]
Merge branch 'issue/1487' into 'develop'
[#1487] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
rinpatch [Sat, 11 Jan 2020 17:38:12 +0000 (17:38 +0000)]
Merge branch 'patch-1' into 'develop'
docs: API: update Mastodon API link
See merge request pleroma/pleroma!2100
rinpatch [Sat, 11 Jan 2020 17:19:54 +0000 (17:19 +0000)]
Merge branch 'remove/remove-mdii-uploader' into 'develop'
Remove MDII uploader
See merge request pleroma/pleroma!2099
Hakaba Hitoyo [Sat, 11 Jan 2020 17:19:54 +0000 (17:19 +0000)]
Remove MDII uploader
Alibek Omarov [Sat, 11 Jan 2020 05:06:40 +0000 (05:06 +0000)]
docs: API: update Mastodon API link
jp [Fri, 10 Jan 2020 19:09:14 +0000 (14:09 -0500)]
Update Dockerfile with labels. Update gitlab-ci for registry usage
Ivan Tashkinov [Fri, 10 Jan 2020 13:18:32 +0000 (16:18 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
# Conflicts:
# lib/pleroma/user.ex
lain [Fri, 10 Jan 2020 13:14:20 +0000 (13:14 +0000)]
Merge branch 'issue/1490' into 'develop'
[#1490] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
lain [Fri, 10 Jan 2020 13:07:20 +0000 (13:07 +0000)]
Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'
OAuth tweaks and tests rework
See merge request pleroma/pleroma!2068
lain [Fri, 10 Jan 2020 11:09:07 +0000 (11:09 +0000)]
Merge branch 'fix/captcha-time' into 'develop'
Fix captcha time, which was meant to be 5 minutes
See merge request pleroma/pleroma!2094
Ivan Tashkinov [Fri, 10 Jan 2020 07:52:21 +0000 (10:52 +0300)]
[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
Mark Felder [Thu, 9 Jan 2020 21:45:46 +0000 (15:45 -0600)]
Fix captcha time, which was meant to be 5 minutes
feld [Thu, 9 Jan 2020 18:35:17 +0000 (18:35 +0000)]
Merge branch 'update/adminfe-
20201019' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2093
Mark Felder [Thu, 9 Jan 2020 16:00:15 +0000 (10:00 -0600)]
Update AdminFE build
Maksim Pechnikov [Wed, 8 Jan 2020 13:40:38 +0000 (16:40 +0300)]
fix create service actor
rinpatch [Tue, 7 Jan 2020 11:43:22 +0000 (11:43 +0000)]
Merge branch 'bugfix/smtp-config-examples' into 'develop'
Fix SMTP mailer example
See merge request pleroma/pleroma!2091
lain [Mon, 6 Jan 2020 14:10:07 +0000 (14:10 +0000)]
Update CHANGELOG.md
RX14 [Sun, 5 Jan 2020 19:00:48 +0000 (19:00 +0000)]
Fix SMTP mailer example
`ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the
same SMTP connection, causing it to fail.
eugenijm [Fri, 20 Dec 2019 13:38:21 +0000 (16:38 +0300)]
Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
Maksim Pechnikov [Fri, 3 Jan 2020 13:21:52 +0000 (16:21 +0300)]
fixed Metadata.Utils.scrub_html_and_truncate
Ivan Tashkinov [Thu, 2 Jan 2020 10:03:33 +0000 (13:03 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
rinpatch [Sat, 28 Dec 2019 12:57:21 +0000 (12:57 +0000)]
Merge branch 'update-captcha' into 'develop'
Update `captcha` dependency
Closes #1492
See merge request pleroma/pleroma!2088
Egor Kislitsyn [Sat, 28 Dec 2019 12:48:54 +0000 (19:48 +0700)]
Update `captcha` dependency
Maksim Pechnikov [Wed, 25 Dec 2019 12:12:43 +0000 (15:12 +0300)]
added code of mr#2067
Haelwenn [Tue, 24 Dec 2019 19:57:41 +0000 (19:57 +0000)]
Merge branch 'feat/doc-improvements' into 'develop'
Documentation imrpovements
See merge request pleroma/pleroma!2084
Maksim Pechnikov [Tue, 24 Dec 2019 17:45:46 +0000 (20:45 +0300)]
fix oauth scopes for AdminApi#reports_update
lain [Mon, 23 Dec 2019 16:31:15 +0000 (16:31 +0000)]
Merge branch 'increase-captcha-expiry-time' into 'develop'
Increase CAPTCHA expiration time to 5 minutes
Closes #1491
See merge request pleroma/pleroma!2086
Maksim Pechnikov [Mon, 23 Dec 2019 14:12:55 +0000 (17:12 +0300)]
update tests
Egor Kislitsyn [Mon, 23 Dec 2019 08:14:46 +0000 (15:14 +0700)]
Increase CAPTCHA expiration time to 5 minutes
Maksim Pechnikov [Sun, 22 Dec 2019 18:17:19 +0000 (21:17 +0300)]
update test
Maksim [Sun, 22 Dec 2019 17:58:54 +0000 (17:58 +0000)]
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
Maksim [Sun, 22 Dec 2019 17:58:45 +0000 (17:58 +0000)]
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
Maksim Pechnikov [Fri, 20 Dec 2019 13:34:14 +0000 (16:34 +0300)]
moved remote follow in separate controller
rinpatch [Sat, 21 Dec 2019 11:56:24 +0000 (11:56 +0000)]
Merge branch 'feature/custom-runtime-modules' into 'develop'
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
rinpatch [Sat, 21 Dec 2019 11:49:35 +0000 (11:49 +0000)]
Merge branch 'revert-
a54aa5af' into 'develop'
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
Closes #1488
See merge request pleroma/pleroma!2083
Maxim Filippov [Sat, 21 Dec 2019 11:41:19 +0000 (11:41 +0000)]
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
This reverts merge request !2076
feld [Fri, 20 Dec 2019 22:40:52 +0000 (22:40 +0000)]
Merge branch 'fix/twitter-card-without-attachments' into 'develop'
Posts without media attachments should get the Summary TwitterCard
See merge request pleroma/pleroma!2082
Mark Felder [Fri, 20 Dec 2019 22:32:04 +0000 (16:32 -0600)]
Posts without media attachments should get the Summary TwitterCard
feld [Fri, 20 Dec 2019 16:30:26 +0000 (16:30 +0000)]
Merge branch 'feature/status-counts-by-scope' into 'develop'
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
feld [Fri, 20 Dec 2019 16:30:00 +0000 (16:30 +0000)]
Merge branch 'fix/remote-user-no-follower-counter' into 'develop'
Do not crash when remote user follower and following counters are hidden
See merge request pleroma/pleroma!2077
Maksim Pechnikov [Fri, 20 Dec 2019 13:33:44 +0000 (16:33 +0300)]
fixed remote follow
projects / akkoma / log