lain [Tue, 9 Jul 2019 08:52:49 +0000 (08:52 +0000)]
Merge branch 'fix/966-local-user-search' into 'develop'
change for local user search
Closes #966
See merge request pleroma/pleroma!1287
Alexander Strizhakov [Tue, 9 Jul 2019 08:52:49 +0000 (08:52 +0000)]
change for local user search
Haelwenn [Mon, 8 Jul 2019 20:40:59 +0000 (20:40 +0000)]
Merge branch 'fix/relationships-in-statuses' into 'develop'
Mastodon API: Fix embedded relationships not being rendered inside of statuses
See merge request pleroma/pleroma!1387
rinpatch [Mon, 8 Jul 2019 08:47:40 +0000 (11:47 +0300)]
Mastodon API: Fix embedded relationships not being rendered inside of statuses
rinpatch [Fri, 5 Jul 2019 18:55:27 +0000 (18:55 +0000)]
Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
Closes #1058
See merge request pleroma/pleroma!1378
Haelwenn [Fri, 5 Jul 2019 04:22:09 +0000 (04:22 +0000)]
Merge branch 'issue/1043' into 'develop'
[#1043] fix search accounts.
See merge request pleroma/pleroma!1372
Maksim [Fri, 5 Jul 2019 04:22:08 +0000 (04:22 +0000)]
[#1043] fix search accounts.
Haelwenn (lanodan) Monnier [Fri, 5 Jul 2019 04:19:27 +0000 (06:19 +0200)]
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1058
rinpatch [Wed, 3 Jul 2019 18:35:57 +0000 (18:35 +0000)]
Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop'
Expose `skip_thread_containment` in nodeinfo
Closes #1030
See merge request pleroma/pleroma!1349
Eugenij [Wed, 3 Jul 2019 18:35:57 +0000 (18:35 +0000)]
Expose `skip_thread_containment` in nodeinfo
feld [Wed, 3 Jul 2019 16:54:47 +0000 (16:54 +0000)]
Merge branch 'fix/migration-alter-citext-field-with-key' into 'develop'
Fix occasional migration failures
See merge request pleroma/pleroma!1373
Roman Chvanikov [Wed, 3 Jul 2019 11:56:02 +0000 (14:56 +0300)]
Split alters rather than work with indexes
rinpatch [Wed, 3 Jul 2019 10:19:51 +0000 (10:19 +0000)]
Merge branch 'handle-search-timeout' into 'develop'
Handle search timeouts for /api/v1/search and /api/v2/search
Closes #994
See merge request pleroma/pleroma!1369
Eugenij [Wed, 3 Jul 2019 10:19:51 +0000 (10:19 +0000)]
Use fallback values for search queries
This is to make sure the entire request doesn't return a 500 error if
user or status search times out.
Haelwenn [Wed, 3 Jul 2019 01:34:16 +0000 (01:34 +0000)]
Merge branch '1048-semver-format-compliance' into 'develop'
Resolved violations of SemVer version format
Closes #1036 and #1048
See merge request pleroma/pleroma!1371
Roman Chvanikov [Tue, 2 Jul 2019 22:14:40 +0000 (01:14 +0300)]
Fix migration
Ivan Tashkinov [Tue, 2 Jul 2019 15:47:53 +0000 (18:47 +0300)]
[#1048] Fixed version parsing in pleroma_ctl. Closes #1036.
Ivan Tashkinov [Tue, 2 Jul 2019 06:04:59 +0000 (09:04 +0300)]
[#1048] Resolved violations of SemVer version format. Refactoring.
kaniini [Tue, 2 Jul 2019 01:27:00 +0000 (01:27 +0000)]
Merge branch 'admin-report-view-user-fallback' into 'develop'
Handle deleted reported accounts in report admin API
Closes #1046
See merge request pleroma/pleroma!1370
Eugenij [Tue, 2 Jul 2019 01:27:00 +0000 (01:27 +0000)]
Add fallback value to the admin report view.
This is to avoid 500 error when the reported user no longer exists
in the database.
rinpatch [Mon, 1 Jul 2019 11:46:07 +0000 (11:46 +0000)]
Merge branch 'fix/changelog' into 'develop'
Move changelog entries
See merge request pleroma/pleroma!1368
Maxim Filippov [Mon, 1 Jul 2019 11:04:24 +0000 (14:04 +0300)]
Move changelog entries
Haelwenn [Mon, 1 Jul 2019 04:52:42 +0000 (04:52 +0000)]
Merge branch 'fix/docs-dry-run' into 'develop'
OTP Release install docs: Remove --dry-run in cron certbot command
See merge request pleroma/pleroma!1366
Haelwenn [Mon, 1 Jul 2019 04:51:56 +0000 (04:51 +0000)]
Merge branch 'ci-improvements' into 'develop'
Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs
See merge request pleroma/pleroma!1360
Haelwenn [Mon, 1 Jul 2019 04:45:00 +0000 (04:45 +0000)]
Merge branch 'chore/changelog-update' into 'develop'
Update changelog and admin API docs with tags, display_name, avatar additions
See merge request pleroma/pleroma!1367
feld [Mon, 1 Jul 2019 01:08:07 +0000 (01:08 +0000)]
Merge branch 'issue/1033' into 'develop'
[#1033] Fix database migrations
See merge request pleroma/pleroma!1350
Maksim [Mon, 1 Jul 2019 01:08:07 +0000 (01:08 +0000)]
[#1033] Fix database migrations
Maxim Filippov [Mon, 1 Jul 2019 00:36:42 +0000 (03:36 +0300)]
Update changelog and admin API docs with tags, display_name, avatar additions
rinpatch [Sun, 30 Jun 2019 10:06:10 +0000 (13:06 +0300)]
OTP Release install docs: Remove --dry-run in cron certbot command
rinpatch [Sun, 30 Jun 2019 09:08:46 +0000 (09:08 +0000)]
Merge branch 'filter-user-statuses-by-hashtag' into 'develop'
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
Closes #974
See merge request pleroma/pleroma!1362
Eugenij [Sun, 30 Jun 2019 09:08:46 +0000 (09:08 +0000)]
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
rinpatch [Sun, 30 Jun 2019 07:28:35 +0000 (07:28 +0000)]
Merge branch 'issues/1026' into 'develop'
[#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text
Closes #1026
See merge request pleroma/pleroma!1363
Maksim [Sun, 30 Jun 2019 07:28:35 +0000 (07:28 +0000)]
[#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text
Haelwenn [Sun, 30 Jun 2019 00:59:40 +0000 (00:59 +0000)]
Merge branch 'fix/pin-unlisted' into 'develop'
Fix not being able to pin unlisted posts
Closes #1038
See merge request pleroma/pleroma!1364
rinpatch [Sat, 29 Jun 2019 19:24:03 +0000 (22:24 +0300)]
Fix not being able to pin unlisted posts
Closes #1038
rinpatch [Sat, 29 Jun 2019 11:25:47 +0000 (14:25 +0300)]
Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs
This is needed because if we run with MIX_ENV=dev we will get a "+dev"
suffix to the version in the docs, but if we run with MIX_ENV=prod the
docs build will fail because ex_doc is dev-only dependency.
rinpatch [Sat, 29 Jun 2019 11:24:14 +0000 (11:24 +0000)]
Merge branch 'my-develop' into 'develop'
Docker specific configuration information
See merge request pleroma/pleroma!1359
deorsum [Sat, 29 Jun 2019 10:39:03 +0000 (20:39 +1000)]
Add a caveat for docker deployment in the config docs
rinpatch [Sat, 29 Jun 2019 10:39:52 +0000 (10:39 +0000)]
Merge branch 'revert/tags-releases-develop' into 'develop'
Revert "Build releases only on tags or develop" on develop
See merge request pleroma/pleroma!1357
rinpatch [Sat, 29 Jun 2019 10:27:15 +0000 (13:27 +0300)]
Revert "Build releases only on tags or develop"
This reverts commit
54d287377054fa48c5a14cf6b056cd80e838b264.
rinpatch [Sat, 29 Jun 2019 09:41:31 +0000 (09:41 +0000)]
Merge branch 'fix/no-untagged-builds-master' into 'develop'
Build releases only on tags or develop
See merge request pleroma/pleroma!1355
rinpatch [Sat, 29 Jun 2019 09:29:12 +0000 (12:29 +0300)]
Build releases only on tags or develop
Needed so we could push documentation updates to master without
triggering a rebuild
rinpatch [Sat, 29 Jun 2019 08:44:56 +0000 (08:44 +0000)]
Merge branch 'fix/release-docs-path-warning' into 'develop'
Add a warning about service files assuming installation paths
See merge request pleroma/pleroma!1353
rinpatch [Sat, 29 Jun 2019 08:35:42 +0000 (11:35 +0300)]
Add a warning about service files assuming installation paths
rinpatch [Sat, 29 Jun 2019 06:01:33 +0000 (06:01 +0000)]
Merge branch 'patch-3' into 'develop'
Move all upload contents despite upload folder itself.
See merge request pleroma/pleroma!1352
rinpatch [Sat, 29 Jun 2019 06:01:30 +0000 (06:01 +0000)]
Merge branch 'patch-2' into 'develop'
Update migrating_from_source_otp_en.md
See merge request pleroma/pleroma!1351
Yuji Nakao [Sat, 29 Jun 2019 04:24:44 +0000 (04:24 +0000)]
Move all upload contents despite upload folder itself.
Yuji Nakao [Sat, 29 Jun 2019 04:17:49 +0000 (04:17 +0000)]
Update migrating_from_source_otp_en.md: Replace `reload-daemon` with `daemon-reload`.
kaniini [Sat, 29 Jun 2019 00:12:09 +0000 (00:12 +0000)]
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
Merge admin and mastodon user views for reports
See merge request pleroma/pleroma!1346
kaniini [Fri, 28 Jun 2019 23:50:23 +0000 (23:50 +0000)]
Merge branch 'feature/mrf-mediaproxy-warm' into 'develop'
MRF: add mediaproxy warming policy
See merge request pleroma/pleroma!1342
William Pitcock [Fri, 28 Jun 2019 23:41:42 +0000 (23:41 +0000)]
test: add tests for mediaproxy warming policy
William Pitcock [Thu, 27 Jun 2019 21:34:27 +0000 (21:34 +0000)]
docs: add documentation for MediaProxyWarmingPolicy
William Pitcock [Thu, 27 Jun 2019 03:06:58 +0000 (03:06 +0000)]
MRF: add mediaproxy warming policy
rinpatch [Fri, 28 Jun 2019 18:25:21 +0000 (18:25 +0000)]
Merge branch 'develop' into 'develop'
Fixed links in documentation
See merge request pleroma/pleroma!1334
Julien Wehmschulte [Fri, 28 Jun 2019 18:25:21 +0000 (18:25 +0000)]
Update docs/installation/arch_linux_en.md, docs/installation/centos7_en.md, docs/installation/debian_based_en.md, docs/installation/debian_based_jp.md, docs/installation/gentoo_en.md files
lain [Fri, 28 Jun 2019 15:29:44 +0000 (15:29 +0000)]
Merge branch 'release/1.0' into 'develop'
1.0 Release
See merge request pleroma/pleroma!1348
lain [Fri, 28 Jun 2019 15:26:09 +0000 (15:26 +0000)]
Merge branch 'release-docs' into 'develop'
Docs on OTP releases
See merge request pleroma/pleroma!1315
lain [Fri, 28 Jun 2019 15:15:44 +0000 (17:15 +0200)]
BUMP OF CHICKEN
1.0
lain [Fri, 28 Jun 2019 12:39:51 +0000 (12:39 +0000)]
Merge branch '2019-06-29-pleromafe' into 'develop'
Update frontend.
See merge request pleroma/pleroma!1347
lain [Fri, 28 Jun 2019 12:29:26 +0000 (14:29 +0200)]
Update frontend.
Maxim Filippov [Fri, 28 Jun 2019 12:27:18 +0000 (15:27 +0300)]
Kowalski, analysis!
Maxim Filippov [Fri, 28 Jun 2019 12:15:32 +0000 (15:15 +0300)]
Merge admin and mastodon user views for reports
rinpatch [Fri, 28 Jun 2019 06:41:34 +0000 (09:41 +0300)]
Add a note about the develop branch
kaniini [Thu, 27 Jun 2019 21:30:54 +0000 (21:30 +0000)]
Merge branch 'fix/syslog-tag' into 'develop'
lowercase syslog tag
See merge request pleroma/pleroma!1344
Mark Felder [Thu, 27 Jun 2019 21:25:55 +0000 (16:25 -0500)]
Add changelog entry for syslog tag change
Mark Felder [Thu, 27 Jun 2019 18:00:22 +0000 (13:00 -0500)]
In my experience syslog tags are usually lowercase
rinpatch [Thu, 27 Jun 2019 06:59:21 +0000 (09:59 +0300)]
Add a note about OS/Distro packages in the readme
rinpatch [Thu, 27 Jun 2019 06:51:00 +0000 (09:51 +0300)]
Add a deprecation warning to the readme
rinpatch [Thu, 27 Jun 2019 06:45:13 +0000 (09:45 +0300)]
Add a note on what OTP releases are
kaniini [Thu, 27 Jun 2019 04:20:17 +0000 (04:20 +0000)]
Merge branch 'idempotency-plug' into 'develop'
Add IdempotencyPlug and use it in all of the api
Closes #1003
See merge request pleroma/pleroma!1339
kaniini [Thu, 27 Jun 2019 04:19:44 +0000 (04:19 +0000)]
Merge branch 'fix/admin-configure' into 'develop'
don't delete config settings on admin update
See merge request pleroma/pleroma!1340
Alexander Strizhakov [Thu, 27 Jun 2019 04:19:44 +0000 (04:19 +0000)]
don't delete config settings on admin update
rinpatch [Wed, 26 Jun 2019 19:15:37 +0000 (19:15 +0000)]
Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'
Update mastofe to bundle-2019-06-26
See merge request pleroma/pleroma!1341
Haelwenn (lanodan) Monnier [Wed, 26 Jun 2019 19:06:28 +0000 (21:06 +0200)]
Update mastofe to bundle-2019-06-26
Egor Kislitsyn [Wed, 26 Jun 2019 18:53:36 +0000 (01:53 +0700)]
Polish IdempotencyPlug
rinpatch [Wed, 26 Jun 2019 12:24:06 +0000 (15:24 +0300)]
Instructions on getting the flavour
rinpatch [Wed, 26 Jun 2019 12:20:22 +0000 (15:20 +0300)]
Do not assume ~pleroma == /opt/pleroma
Egor Kislitsyn [Wed, 26 Jun 2019 12:19:07 +0000 (19:19 +0700)]
Fix credo warning
Egor Kislitsyn [Wed, 26 Jun 2019 11:49:14 +0000 (18:49 +0700)]
Remove previous idempotency implementation from `post_status`
Egor Kislitsyn [Wed, 26 Jun 2019 11:42:49 +0000 (18:42 +0700)]
Enable IdempotencyPlug for the all API
Egor Kislitsyn [Wed, 26 Jun 2019 11:36:42 +0000 (18:36 +0700)]
Add Idempotency plug
Haelwenn [Wed, 26 Jun 2019 10:59:28 +0000 (10:59 +0000)]
Merge branch 'fix/handle-wrong-visibility-error' into 'develop'
Return correct response when reply to a direct message is not direct itself
Closes #1010
See merge request pleroma/pleroma!1336
Sergey Suprunenko [Wed, 26 Jun 2019 10:59:27 +0000 (10:59 +0000)]
Return correct response when reply to a direct message is not direct itself
rinpatch [Wed, 26 Jun 2019 08:34:58 +0000 (11:34 +0300)]
Add all the remaining sections to Switching to OTP releases
kaniini [Wed, 26 Jun 2019 05:34:26 +0000 (05:34 +0000)]
Merge branch 'refactoring/fix_render_view' into 'develop'
Fix Controller.render/4 deprecation
See merge request pleroma/pleroma!1337
kaniini [Wed, 26 Jun 2019 05:34:02 +0000 (05:34 +0000)]
Merge branch 'feature/configurable-pack-extensions' into 'develop'
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
rinpatch [Wed, 26 Jun 2019 03:55:20 +0000 (03:55 +0000)]
Merge branch 'issues/1016' into 'develop'
[#1016] add clear formatted text/ removes links with private ip
See merge request pleroma/pleroma!1335
Maksim Pechnikov [Wed, 26 Jun 2019 03:46:06 +0000 (06:46 +0300)]
update changelog
rinpatch [Wed, 26 Jun 2019 03:48:59 +0000 (06:48 +0300)]
Make default pack extensions configurable and default to png and gif
Maksim [Wed, 26 Jun 2019 03:43:53 +0000 (03:43 +0000)]
Apply suggestion to CHANGELOG.md
Maksim Pechnikov [Wed, 26 Jun 2019 03:39:50 +0000 (06:39 +0300)]
update changelog
Maksim Pechnikov [Wed, 26 Jun 2019 03:24:12 +0000 (06:24 +0300)]
fix validate_page_url
Maksim [Wed, 26 Jun 2019 03:23:26 +0000 (03:23 +0000)]
Apply suggestion to docs/config.md
Roman Chvanikov [Wed, 26 Jun 2019 00:27:37 +0000 (03:27 +0300)]
Fix Controller.render/4 deprecation
Maksim Pechnikov [Tue, 25 Jun 2019 19:25:37 +0000 (22:25 +0300)]
add ignore hosts and TLDs for rich_media
Maksim Pechnikov [Tue, 25 Jun 2019 14:54:03 +0000 (17:54 +0300)]
add test
Maksim Pechnikov [Tue, 25 Jun 2019 12:52:53 +0000 (15:52 +0300)]
fix validate_url for private ip
rinpatch [Tue, 25 Jun 2019 02:50:25 +0000 (05:50 +0300)]
Add a note that OTP releases don't contain revision history
rinpatch [Tue, 25 Jun 2019 01:55:41 +0000 (04:55 +0300)]
Remove the useless specification of test size and make the main points bold
kaniini [Mon, 24 Jun 2019 19:01:56 +0000 (19:01 +0000)]
Merge branch 'issues/184' into 'develop'
[#184] small refactoring reset password
See merge request pleroma/pleroma!1301
projects / akkoma / log