akkoma
4 years agoMerge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
sadposter [Thu, 23 Jan 2020 11:55:07 +0000 (11:55 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

4 years agoMerge branch 'emoji-notifications' into 'develop'
Haelwenn [Thu, 23 Jan 2020 02:12:03 +0000 (02:12 +0000)]
Merge branch 'emoji-notifications' into 'develop'

Emoji notifications

See merge request pleroma/pleroma!2130

4 years agoMerge branch 'develop' into 'develop'
Haelwenn [Thu, 23 Jan 2020 02:05:22 +0000 (02:05 +0000)]
Merge branch 'develop' into 'develop'

Updated OpenBSD installation guide for version OpenBSD 6.6

See merge request pleroma/pleroma!2131

4 years agoUpdated OpenBSD installation guide for version OpenBSD 6.6
Farhan Khan [Wed, 22 Jan 2020 22:33:10 +0000 (17:33 -0500)]
Updated OpenBSD installation guide for version OpenBSD 6.6
* initdb command now requires explicit -U and -D flags
* acme-client now requires version v02 API endpoint
* Added step to add admin user, per other installation guides
* Corrected setup_db.psql path

4 years agoUpdate changelog
lain [Wed, 22 Jan 2020 19:12:45 +0000 (20:12 +0100)]
Update changelog

4 years agoDocument new EmojiReaction notifications
lain [Wed, 22 Jan 2020 19:11:18 +0000 (20:11 +0100)]
Document new EmojiReaction notifications

4 years agoNotifications: Add emoji reaction notifications
lain [Wed, 22 Jan 2020 19:06:12 +0000 (20:06 +0100)]
Notifications: Add emoji reaction notifications

4 years agoMerge branch 'no-error-404' into 'develop'
rinpatch [Wed, 22 Jan 2020 17:55:49 +0000 (17:55 +0000)]
Merge branch 'no-error-404' into 'develop'

Log at debug level for object deletion, not error.

See merge request pleroma/pleroma!2066

4 years agoMerge branch 'admin-be' into 'develop'
feld [Wed, 22 Jan 2020 17:13:17 +0000 (17:13 +0000)]
Merge branch 'admin-be' into 'develop'

Config api for admin-fe

Closes #1406

See merge request pleroma/pleroma!1976

4 years agolittle fixes
Alexander Strizhakov [Wed, 22 Jan 2020 15:22:54 +0000 (18:22 +0300)]
little fixes

4 years agodocs update
Alexander Strizhakov [Wed, 22 Jan 2020 15:08:53 +0000 (18:08 +0300)]
docs update

4 years agoMerge branch 'mastofe/bundle-2020-01-22' into 'develop'
rinpatch [Wed, 22 Jan 2020 15:06:26 +0000 (15:06 +0000)]
Merge branch 'mastofe/bundle-2020-01-22' into 'develop'

Update MastoFE bundle to 2020-01-22

See merge request pleroma/pleroma!2127

4 years agoUpdate MastoFE bundle to 2020-01-22
Haelwenn (lanodan) Monnier [Wed, 22 Jan 2020 15:00:23 +0000 (16:00 +0100)]
Update MastoFE bundle to 2020-01-22

4 years agoMerge branch 'emoji-reaction-extensions-2' into 'develop'
rinpatch [Wed, 22 Jan 2020 14:11:01 +0000 (14:11 +0000)]
Merge branch 'emoji-reaction-extensions-2' into 'develop'

Emoji Reactions: In the API, sort them by first emoji insertion date

See merge request pleroma/pleroma!2126

4 years agoEmoji reactions: Document changes
lain [Wed, 22 Jan 2020 12:58:02 +0000 (13:58 +0100)]
Emoji reactions: Document changes

4 years agoEmoji reactions: Change cache and reply format
lain [Wed, 22 Jan 2020 12:57:42 +0000 (13:57 +0100)]
Emoji reactions: Change cache and reply format

4 years agosupport for updating env after settings deletion
Alexander Strizhakov [Wed, 22 Jan 2020 12:14:11 +0000 (15:14 +0300)]
support for updating env after settings deletion

4 years agoMerge branch 'develop' into admin-be
Alexander Strizhakov [Wed, 22 Jan 2020 08:22:31 +0000 (11:22 +0300)]
Merge branch 'develop' into admin-be

4 years agoRevert "Update AdminFE build"
Alexander Strizhakov [Wed, 22 Jan 2020 08:21:35 +0000 (08:21 +0000)]
Revert "Update AdminFE build"

This reverts commit 6395ad942c7087e97a8dcf2e9002005ed7b4c383

4 years agoMerge branch 'fix/attachments-cleanup' into 'develop'
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

4 years agoMerge branch 'update/adminfe-20200121-part2' into 'develop'
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

4 years agoLast AdminFE update was accidentally built from master, not develop
Mark Felder [Tue, 21 Jan 2020 21:09:16 +0000 (15:09 -0600)]
Last AdminFE update was accidentally built from master, not develop

4 years agoMerge branch 'update/adminfe-20200121' into '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

4 years agoUpdate AdminFE build
Mark Felder [Tue, 21 Jan 2020 19:41:22 +0000 (13:41 -0600)]
Update AdminFE build

4 years agoMerge branch 'fix/attachments-cleanup' of git.pleroma.social:pleroma/pleroma into...
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

4 years agoAdd delete_attachments queue to config
Roman Chvanikov [Tue, 21 Jan 2020 16:48:14 +0000 (19:48 +0300)]
Add delete_attachments queue to config

4 years agoMerge branch 'develop' into fix/attachments-cleanup
Roman Chvanikov [Tue, 21 Jan 2020 16:45:13 +0000 (19:45 +0300)]
Merge branch 'develop' into fix/attachments-cleanup

4 years agosome refactor and tests
Alexander Strizhakov [Tue, 21 Jan 2020 14:49:22 +0000 (17:49 +0300)]
some refactor and tests

4 years agoMerge branch 'emoji-reaction-extensions' into 'develop'
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

4 years agoMerge branch 'issue/1484' into 'develop'
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

4 years agoMerge branch 'develop' into admin-be
Alexander Strizhakov [Tue, 21 Jan 2020 07:32:27 +0000 (10:32 +0300)]
Merge branch 'develop' into admin-be

4 years agofix for db key
Alexander Strizhakov [Tue, 21 Jan 2020 07:14:48 +0000 (10:14 +0300)]
fix for db key

4 years agoexclude blocked user posts from search results
Maksim Pechnikov [Mon, 20 Jan 2020 18:47:44 +0000 (21:47 +0300)]
exclude blocked user posts from search results

4 years agoMerge branch 'develop' into fix/attachments-cleanup
Mark Felder [Mon, 20 Jan 2020 18:55:51 +0000 (12:55 -0600)]
Merge branch 'develop' into fix/attachments-cleanup

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction...
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

4 years agoMerge branch '1521-admin-report-test-fix' into 'develop'
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

4 years ago[#1521] AdminApiControllerTest: fixed create report test (OAuth).
Ivan Tashkinov [Mon, 20 Jan 2020 17:04:25 +0000 (20:04 +0300)]
[#1521] AdminApiControllerTest: fixed create report test (OAuth).

4 years agoMerge branch 'favoritng-responses' into 'develop'
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

4 years agoUpdate changelog
lain [Mon, 20 Jan 2020 15:31:12 +0000 (16:31 +0100)]
Update changelog

4 years agomerge fix
Alexander Strizhakov [Mon, 20 Jan 2020 15:25:00 +0000 (18:25 +0300)]
merge fix

4 years agoStatusView: Add `emoji_reactions`
lain [Mon, 20 Jan 2020 15:24:20 +0000 (16:24 +0100)]
StatusView: Add `emoji_reactions`

4 years agoMerge branch 'credo/version-bump-1.1.5' into 'develop'
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

4 years agoStatusControllerTest: Fix typo
lain [Mon, 20 Jan 2020 14:31:14 +0000 (15:31 +0100)]
StatusControllerTest: Fix typo

4 years agoMerge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
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

4 years agoCommonAPI: Don't error out on double favs/repeats
lain [Mon, 20 Jan 2020 13:27:59 +0000 (14:27 +0100)]
CommonAPI: Don't error out on double favs/repeats

4 years agoMerge branch 'fix-admin-api-scope' into 'develop'
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

4 years agoPleroma API: `emoji_reactions_by` does not need authorization
lain [Mon, 20 Jan 2020 12:05:35 +0000 (13:05 +0100)]
Pleroma API: `emoji_reactions_by` does not need authorization

4 years agoMerge branch 'hashtag-benchmarks' into 'develop'
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

4 years agoAdd benchmark of any/all tag options
lain [Mon, 20 Jan 2020 11:19:15 +0000 (12:19 +0100)]
Add benchmark of any/all tag options

4 years agoBump credo to 1.1.5
Haelwenn (lanodan) Monnier [Mon, 20 Jan 2020 10:53:14 +0000 (11:53 +0100)]
Bump credo to 1.1.5

4 years agoMerge branch 'features/cleanup-incoming-actor' into 'develop'
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

4 years agoMerge branch 'feat/startup-migration-check' into 'develop'
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

4 years agoCheck for unapplied migrations on startup
rinpatch [Thu, 16 Jan 2020 16:01:31 +0000 (19:01 +0300)]
Check for unapplied migrations on startup

Closes #1328

4 years agoFix credo warning
Roman Chvanikov [Sun, 19 Jan 2020 19:09:47 +0000 (22:09 +0300)]
Fix credo warning

4 years agoAdd test case for attachment deletion when non-map data.url present in DB
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

4 years agoDelete attachments asynchronously
Roman Chvanikov [Sun, 19 Jan 2020 16:45:20 +0000 (19:45 +0300)]
Delete attachments asynchronously

4 years agomix.lock: update mock to 0.3.4
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

4 years agotransmogrifier.ex: simplify handle_incoming of actors
Haelwenn (lanodan) Monnier [Sun, 19 Jan 2020 06:02:16 +0000 (07:02 +0100)]
transmogrifier.ex: simplify handle_incoming of actors

4 years agoreleases support
Alexander Strizhakov [Sat, 18 Jan 2020 13:55:33 +0000 (16:55 +0300)]
releases support

4 years agofull update for some subkeys
Alexander Strizhakov [Sat, 18 Jan 2020 09:25:56 +0000 (12:25 +0300)]
full update for some subkeys

4 years agoDelete attachments after object and cache cleanup
Roman Chvanikov [Fri, 17 Jan 2020 17:20:37 +0000 (20:20 +0300)]
Delete attachments after object and cache cleanup

4 years agoreturn db key on update requests
Alexander Strizhakov [Fri, 17 Jan 2020 15:08:45 +0000 (18:08 +0300)]
return db key on update requests

4 years agosome clean up
Alexander Strizhakov [Fri, 17 Jan 2020 13:28:44 +0000 (16:28 +0300)]
some clean up

4 years agorevert non needable
Alexander Strizhakov [Fri, 17 Jan 2020 12:13:24 +0000 (15:13 +0300)]
revert non needable

4 years agoconfigure only console backend
Alexander Strizhakov [Fri, 17 Jan 2020 12:06:42 +0000 (15:06 +0300)]
configure only console backend

4 years agocompile fix
Alexander Strizhakov [Fri, 17 Jan 2020 12:00:20 +0000 (15:00 +0300)]
compile fix

4 years agofix for config loader
Alexander Strizhakov [Fri, 17 Jan 2020 08:54:22 +0000 (11:54 +0300)]
fix for config loader

4 years agosaving to DB only added by user settings
Alexander Strizhakov [Fri, 17 Jan 2020 08:45:44 +0000 (11:45 +0300)]
saving to DB only added by user settings

4 years agoMerge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
sadposter [Thu, 16 Jan 2020 16:17:56 +0000 (16:17 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

4 years agobranch
sadposter [Thu, 16 Jan 2020 16:13:51 +0000 (16:13 +0000)]
branch

4 years agorenaming
Alexander Strizhakov [Thu, 16 Jan 2020 05:50:27 +0000 (08:50 +0300)]
renaming

Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB

4 years agoMerge branch 'ci/docker-imaging' into 'develop'
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

4 years agoUpdate docker release / stable jobs
jp [Wed, 15 Jan 2020 22:25:33 +0000 (17:25 -0500)]
Update docker release / stable jobs

4 years agoUpdate docker jobs for release branches and stable branches
jp [Wed, 15 Jan 2020 21:54:53 +0000 (16:54 -0500)]
Update docker jobs for release branches and stable branches

4 years agoFix only: on docker develop/latest job
jp [Wed, 15 Jan 2020 21:41:41 +0000 (16:41 -0500)]
Fix only: on docker develop/latest job

4 years agoupdate `only:` for release/ branch regex matching. and to avoid running image builds...
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

4 years agoFix odd spacing
jp [Wed, 15 Jan 2020 21:16:29 +0000 (16:16 -0500)]
Fix odd spacing

4 years agoMerge branch '1478-oauth-admin-scopes-tweaks' into 'develop'
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

4 years ago[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.
Ivan Tashkinov [Wed, 15 Jan 2020 15:38:18 +0000 (18:38 +0300)]
[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes...
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

4 years agolittle cleanup
Alexander Strizhakov [Wed, 15 Jan 2020 14:10:33 +0000 (17:10 +0300)]
little cleanup

4 years agodon't migrate Pleroma.Web.EndPoint settings
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

4 years agoMerge branch 'notifications-from-account' into 'develop'
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

4 years agoFix notification controller test
Egor Kislitsyn [Wed, 15 Jan 2020 12:51:09 +0000 (16:51 +0400)]
Fix notification controller test

4 years agoMerge branch 'develop' into notifications-from-account
Egor Kislitsyn [Wed, 15 Jan 2020 12:49:45 +0000 (16:49 +0400)]
Merge branch 'develop' into notifications-from-account

4 years agoBenchmarks: Move to correct folder
lain [Wed, 15 Jan 2020 11:37:50 +0000 (12:37 +0100)]
Benchmarks: Move to correct folder

4 years ago[#1478] Adjusted AdminAPIController admin subscope requirements.
Ivan Tashkinov [Wed, 15 Jan 2020 09:11:23 +0000 (12:11 +0300)]
[#1478] Adjusted AdminAPIController admin subscope requirements.

4 years agoMerge branch 'features/docker-updates' into 'develop'
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

4 years agoRemove forked test branch matching
jp [Tue, 14 Jan 2020 18:47:36 +0000 (13:47 -0500)]
Remove forked test branch matching

4 years agoRemove artifacts passing by setting `dependencies: []`
jp [Tue, 14 Jan 2020 18:45:47 +0000 (13:45 -0500)]
Remove artifacts passing by setting `dependencies: []`

4 years agoMerge branch 'features/docker-updates' into 'develop'
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

4 years agoAdd allow_failure to docker jobs
jp [Tue, 14 Jan 2020 17:43:28 +0000 (12:43 -0500)]
Add allow_failure to docker jobs

4 years agoRemove cache from docker jobs. Split devlop and stable branches into their own 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

4 years agoMerge branch 'develop' into admin-be
Alexander Strizhakov [Tue, 14 Jan 2020 16:56:33 +0000 (19:56 +0300)]
Merge branch 'develop' into admin-be

4 years agoCheck if object->data is array when looking up attachment objects to delete
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

4 years agoMix Tasks: Add pleroma.benchmarks.tags
lain [Tue, 14 Jan 2020 16:24:26 +0000 (17:24 +0100)]
Mix Tasks: Add pleroma.benchmarks.tags

4 years agoMerge branch 'warnings-fix' into 'develop'
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

4 years agocompilation warnings fix
Alexander Strizhakov [Tue, 14 Jan 2020 12:49:52 +0000 (15:49 +0300)]
compilation warnings fix

4 years agoshort labels and fixes for typos
Alexander Strizhakov [Tue, 14 Jan 2020 12:00:38 +0000 (15:00 +0300)]
short labels and fixes for typos

4 years agoMerge branch 'develop' into admin-be
Alexander Strizhakov [Tue, 14 Jan 2020 11:52:00 +0000 (14:52 +0300)]
Merge branch 'develop' into admin-be