lain [Tue, 28 Jan 2020 15:40:44 +0000 (16:40 +0100)]
Streamer: Correctly handle reblog mutes
feld [Tue, 28 Jan 2020 14:52:57 +0000 (14:52 +0000)]
Merge branch 'fix/attachments-cleanup' into 'develop'
Fix attachments cleanup with custom base_url
See merge request pleroma/pleroma!2154
lain [Tue, 28 Jan 2020 14:30:34 +0000 (14:30 +0000)]
Merge branch 'fix-elixir-v1.10' into 'develop'
Fix compatibility with Elixir v1.10
See merge request pleroma/pleroma!2153
Egor Kislitsyn [Tue, 28 Jan 2020 14:23:59 +0000 (18:23 +0400)]
Fix compatibility with Elixir v1.10
Roman Chvanikov [Tue, 28 Jan 2020 14:22:24 +0000 (17:22 +0300)]
Add test for custom base_url when deleting an attachment
Roman Chvanikov [Tue, 28 Jan 2020 14:07:46 +0000 (17:07 +0300)]
Fix base_url string trimming
Roman Chvanikov [Tue, 28 Jan 2020 13:52:20 +0000 (16:52 +0300)]
Add logging
Roman Chvanikov [Tue, 28 Jan 2020 13:38:44 +0000 (16:38 +0300)]
Fix __MODULE__ usage
lain [Tue, 28 Jan 2020 13:26:28 +0000 (13:26 +0000)]
Merge branch 'translation/errors-french' into 'develop'
Translation/errors french
See merge request pleroma/pleroma!1457
lain [Tue, 28 Jan 2020 12:57:07 +0000 (12:57 +0000)]
Merge branch 'docs_introduction' into 'develop'
DOCS General update for the "Introduction to Pleroma" section
See merge request pleroma/pleroma!2101
Ilja [Tue, 28 Jan 2020 12:57:06 +0000 (12:57 +0000)]
DOCS General update for the "Introduction to Pleroma" section
* Put url's between angle brackets. docs-develop doesn't list the url's as links, I assume these will fix that (but don't know if I can check)
* Added a third space before the "sub"bulletpoints. docs-develop doesn't show them as subpoints with only two spaces. I hope three will fix it (but don't know if I can check)
* Added a newline above the bulletpoints because otherwise they are broken on docs-develop
* Remove the :smile: thingies because neither of the docs (docs.pleroma.social and docs-develop.social) show them as emojis
* Add a link to fediverse.network
* Update to add new stuff and fix things that aren't correct (any more)
lain [Tue, 28 Jan 2020 12:49:22 +0000 (12:49 +0000)]
Merge branch 'support/update_ecto' into 'develop'
updated ecto and fixed warning
See merge request pleroma/pleroma!2150
lain [Tue, 28 Jan 2020 12:40:00 +0000 (12:40 +0000)]
Merge branch 'fix/attachments-cleanup' into 'develop'
Fix/attachments cleanup
See merge request pleroma/pleroma!2148
Maksim Pechnikov [Tue, 28 Jan 2020 07:43:47 +0000 (10:43 +0300)]
update ecto
Roman Chvanikov [Tue, 28 Jan 2020 00:54:54 +0000 (03:54 +0300)]
Remove unused var
Roman Chvanikov [Tue, 28 Jan 2020 00:52:35 +0000 (03:52 +0300)]
explicitly describe perform op in AttachmentsClenupWorker
Haelwenn [Mon, 27 Jan 2020 13:21:50 +0000 (13:21 +0000)]
Merge branch 'remove/suggestions-third-party-engine' into 'develop'
Remove user recommendation by third party engine
See merge request pleroma/pleroma!2141
Hakaba Hitoyo [Mon, 27 Jan 2020 13:21:50 +0000 (13:21 +0000)]
Remove user recommendation by third party engine
Haelwenn [Mon, 27 Jan 2020 11:45:26 +0000 (11:45 +0000)]
Merge branch 'descriptions-fixes' into 'develop'
Little fixes for descriptions.exs
See merge request pleroma/pleroma!2147
Alexander Strizhakov [Mon, 27 Jan 2020 09:53:21 +0000 (12:53 +0300)]
little fixes
Roman Chvanikov [Mon, 27 Jan 2020 01:01:50 +0000 (04:01 +0300)]
Fix typo
feld [Sun, 26 Jan 2020 17:35:21 +0000 (17:35 +0000)]
Merge branch 'fix/runtime-config' into 'develop'
Fixes for runtime config
See merge request pleroma/pleroma!2143
feld [Sun, 26 Jan 2020 17:33:12 +0000 (17:33 +0000)]
Merge branch 'issue/1280' into 'develop'
[#1280] updated error messages for authentication process
Closes #1280
See merge request pleroma/pleroma!2111
Mark Felder [Sun, 26 Jan 2020 17:23:05 +0000 (11:23 -0600)]
Merge branch 'develop' into issue/1280
feld [Sun, 26 Jan 2020 17:21:49 +0000 (17:21 +0000)]
Merge branch 'fix/descriptions' into 'develop'
Fixes for descriptions.exs
Closes admin-fe#68
See merge request pleroma/pleroma!2145
Alexander Strizhakov [Sat, 25 Jan 2020 16:45:51 +0000 (19:45 +0300)]
description typos, Oban verbose type fix, new keys
Alexander Strizhakov [Sat, 25 Jan 2020 07:39:10 +0000 (10:39 +0300)]
can be changed in runtime
Alexander Strizhakov [Sat, 25 Jan 2020 07:33:27 +0000 (10:33 +0300)]
respect settings from database in mix tasks
feld [Fri, 24 Jan 2020 14:11:06 +0000 (14:11 +0000)]
Merge branch 'chore/changelog-for-dynamic-config' into 'develop'
Document dynamic_configuration breaking change
See merge request pleroma/pleroma!2142
Mark Felder [Fri, 24 Jan 2020 14:04:25 +0000 (08:04 -0600)]
Document dynamic_configuration breaking change
feld [Fri, 24 Jan 2020 13:54:44 +0000 (13:54 +0000)]
Merge branch 'fix/better-descriptions-for-email-fields' into 'develop'
Better descriptions for email fields for admin-fe
Closes admin-fe#67
See merge request pleroma/pleroma!2138
rinpatch [Fri, 24 Jan 2020 11:33:02 +0000 (11:33 +0000)]
Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
Fix for non existing atom
Closes #1532
See merge request pleroma/pleroma!2139
rinpatch [Fri, 24 Jan 2020 11:32:25 +0000 (11:32 +0000)]
Merge branch 'emoji-reaction-sanity-check' into 'develop'
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
rinpatch [Fri, 24 Jan 2020 11:31:34 +0000 (11:31 +0000)]
Merge branch 'fix/removing-mdii-uploader-from-descriptions' into 'develop'
Removing deleted MDII uploader from suggestions
Closes admin-fe#64
See merge request pleroma/pleroma!2137
rinpatch [Fri, 24 Jan 2020 11:31:24 +0000 (11:31 +0000)]
Merge branch 'emoji-reaction-api-change-2' into 'develop'
Emoji reaction api change 2
See merge request pleroma/pleroma!2140
lain [Fri, 24 Jan 2020 09:53:01 +0000 (10:53 +0100)]
Emoji reactions: Update docs and changelog
lain [Fri, 24 Jan 2020 09:52:24 +0000 (10:52 +0100)]
Emoji reactions: Change api format once more
Alexander Strizhakov [Fri, 24 Jan 2020 09:22:26 +0000 (12:22 +0300)]
fix for non existing atom
Alexander Strizhakov [Fri, 24 Jan 2020 08:19:12 +0000 (11:19 +0300)]
better descriptions for email fields for admin-fe
Alexander Strizhakov [Fri, 24 Jan 2020 08:05:03 +0000 (11:05 +0300)]
removing deleted MDII uploader from suggestions
feld [Fri, 24 Jan 2020 00:25:38 +0000 (00:25 +0000)]
Merge branch 'fix_for_migrate_to_db_test' into 'develop'
Fix for migrate to db test
See merge request pleroma/pleroma!2133
feld [Thu, 23 Jan 2020 17:18:11 +0000 (17:18 +0000)]
Merge branch 'truncate_config_table_on_migrate_to_db' into 'develop'
Truncate config table on migrate to db task and fix for parsing Swoosh adapters
Closes #1529
See merge request pleroma/pleroma!2136
Alexander Strizhakov [Thu, 23 Jan 2020 15:21:29 +0000 (18:21 +0300)]
parsing Swoosh modules
Alexander Strizhakov [Thu, 23 Jan 2020 14:48:45 +0000 (17:48 +0300)]
restart config id after truncate
Alexander Strizhakov [Thu, 23 Jan 2020 14:23:02 +0000 (17:23 +0300)]
truncate config table on migrate to db task
Alexander Strizhakov [Thu, 23 Jan 2020 12:13:27 +0000 (15:13 +0300)]
fix for migrate to db test
lain [Thu, 23 Jan 2020 11:34:34 +0000 (12:34 +0100)]
Emoji reactions: Add sanity checks for the cache
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
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
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
lain [Wed, 22 Jan 2020 19:12:45 +0000 (20:12 +0100)]
Update changelog
lain [Wed, 22 Jan 2020 19:11:18 +0000 (20:11 +0100)]
Document new EmojiReaction notifications
lain [Wed, 22 Jan 2020 19:06:12 +0000 (20:06 +0100)]
Notifications: Add emoji reaction notifications
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
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
Alexander Strizhakov [Wed, 22 Jan 2020 15:22:54 +0000 (18:22 +0300)]
little fixes
Alexander Strizhakov [Wed, 22 Jan 2020 15:08:53 +0000 (18:08 +0300)]
docs update
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
Haelwenn (lanodan) Monnier [Wed, 22 Jan 2020 15:00:23 +0000 (16:00 +0100)]
Update MastoFE bundle to 2020-01-22
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
lain [Wed, 22 Jan 2020 12:58:02 +0000 (13:58 +0100)]
Emoji reactions: Document changes
lain [Wed, 22 Jan 2020 12:57:42 +0000 (13:57 +0100)]
Emoji reactions: Change cache and reply format
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
projects / akkoma / log