Alexander Strizhakov [Wed, 22 Jan 2020 15:08:53 +0000 (18:08 +0300)]
docs update
Alexander Strizhakov [Wed, 22 Jan 2020 12:14:11 +0000 (15:14 +0300)]
support for updating env after settings deletion
Alexander Strizhakov [Wed, 22 Jan 2020 08:22:31 +0000 (11:22 +0300)]
Merge branch 'develop' into admin-be
Alexander Strizhakov [Wed, 22 Jan 2020 08:21:35 +0000 (08:21 +0000)]
Revert "Update AdminFE build"
This reverts commit
6395ad942c7087e97a8dcf2e9002005ed7b4c383
feld [Tue, 21 Jan 2020 22:44:04 +0000 (22:44 +0000)]
Merge branch 'fix/attachments-cleanup' into 'develop'
Delete attachments in queue with infinite timeout and ensure object.data.url is an array
See merge request pleroma/pleroma!2103
feld [Tue, 21 Jan 2020 21:15:32 +0000 (21:15 +0000)]
Merge branch 'update/adminfe-
20200121-part2' into 'develop'
AdminFE update, again
See merge request pleroma/pleroma!2125
Mark Felder [Tue, 21 Jan 2020 21:09:16 +0000 (15:09 -0600)]
Last AdminFE update was accidentally built from master, not develop
feld [Tue, 21 Jan 2020 19:49:02 +0000 (19:49 +0000)]
Merge branch 'update/adminfe-
20200121' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2124
Mark Felder [Tue, 21 Jan 2020 19:41:22 +0000 (13:41 -0600)]
Update AdminFE build
Roman Chvanikov [Tue, 21 Jan 2020 16:48:27 +0000 (19:48 +0300)]
Merge branch 'fix/attachments-cleanup' of git.pleroma.social:pleroma/pleroma into fix/attachments-cleanup
Roman Chvanikov [Tue, 21 Jan 2020 16:48:14 +0000 (19:48 +0300)]
Add delete_attachments queue to config
Roman Chvanikov [Tue, 21 Jan 2020 16:45:13 +0000 (19:45 +0300)]
Merge branch 'develop' into fix/attachments-cleanup
Alexander Strizhakov [Tue, 21 Jan 2020 14:49:22 +0000 (17:49 +0300)]
some refactor and tests
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
Alexander Strizhakov [Tue, 21 Jan 2020 07:32:27 +0000 (10:32 +0300)]
Merge branch 'develop' into admin-be
Alexander Strizhakov [Tue, 21 Jan 2020 07:14:48 +0000 (10:14 +0300)]
fix for db key
Maksim Pechnikov [Mon, 20 Jan 2020 18:47:44 +0000 (21:47 +0300)]
exclude blocked user posts from search results
Mark Felder [Mon, 20 Jan 2020 18:55:51 +0000 (12:55 -0600)]
Merge branch 'develop' into fix/attachments-cleanup
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
Alexander Strizhakov [Mon, 20 Jan 2020 15:25:00 +0000 (18:25 +0300)]
merge fix
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
Roman Chvanikov [Sun, 19 Jan 2020 19:09:47 +0000 (22:09 +0300)]
Fix credo warning
Roman Chvanikov [Sun, 19 Jan 2020 19:04:14 +0000 (22:04 +0300)]
Add test case for attachment deletion when non-map data.url present in DB
Roman Chvanikov [Sun, 19 Jan 2020 16:45:20 +0000 (19:45 +0300)]
Delete attachments asynchronously
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
Alexander Strizhakov [Sat, 18 Jan 2020 13:55:33 +0000 (16:55 +0300)]
releases support
Alexander Strizhakov [Sat, 18 Jan 2020 09:25:56 +0000 (12:25 +0300)]
full update for some subkeys
Roman Chvanikov [Fri, 17 Jan 2020 17:20:37 +0000 (20:20 +0300)]
Delete attachments after object and cache cleanup
Alexander Strizhakov [Fri, 17 Jan 2020 15:08:45 +0000 (18:08 +0300)]
return db key on update requests
Alexander Strizhakov [Fri, 17 Jan 2020 13:28:44 +0000 (16:28 +0300)]
some clean up
Alexander Strizhakov [Fri, 17 Jan 2020 12:13:24 +0000 (15:13 +0300)]
revert non needable
Alexander Strizhakov [Fri, 17 Jan 2020 12:06:42 +0000 (15:06 +0300)]
configure only console backend
Alexander Strizhakov [Fri, 17 Jan 2020 12:00:20 +0000 (15:00 +0300)]
compile fix
Alexander Strizhakov [Fri, 17 Jan 2020 08:54:22 +0000 (11:54 +0300)]
fix for config loader
Alexander Strizhakov [Fri, 17 Jan 2020 08:45:44 +0000 (11:45 +0300)]
saving to DB only added by user settings
Alexander Strizhakov [Thu, 16 Jan 2020 05:50:27 +0000 (08:50 +0300)]
renaming
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
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
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
Alexander Strizhakov [Wed, 15 Jan 2020 14:10:33 +0000 (17:10 +0300)]
little cleanup
Alexander Strizhakov [Wed, 15 Jan 2020 14:08:45 +0000 (17:08 +0300)]
don't migrate Pleroma.Web.EndPoint settings
don't set Logger level to all tasks
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: []`
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
Alexander Strizhakov [Tue, 14 Jan 2020 16:56:33 +0000 (19:56 +0300)]
Merge branch 'develop' into admin-be
Roman Chvanikov [Tue, 14 Jan 2020 16:53:28 +0000 (19:53 +0300)]
Check if object->data is array when looking up attachment objects to delete
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
Alexander Strizhakov [Tue, 14 Jan 2020 12:00:38 +0000 (15:00 +0300)]
short labels and fixes for typos
Alexander Strizhakov [Tue, 14 Jan 2020 11:52:00 +0000 (14:52 +0300)]
Merge branch 'develop' into admin-be
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
Alexander Strizhakov [Sat, 11 Jan 2020 09:15:42 +0000 (12:15 +0300)]
Merge branch 'develop' into admin-be
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
Alexander Strizhakov [Fri, 10 Jan 2020 18:24:06 +0000 (21:24 +0300)]
don't migrate prometheus settings
Alexander Strizhakov [Fri, 10 Jan 2020 16:49:40 +0000 (19:49 +0300)]
more renamings