akkoma
5 years agoMerge branch 'fix/changelog' into 'develop'
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

5 years agoMove changelog entries
Maxim Filippov [Mon, 1 Jul 2019 11:04:24 +0000 (14:04 +0300)]
Move changelog entries

5 years agoMerge branch 'fix/docs-dry-run' into 'develop'
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

5 years agoMerge branch 'ci-improvements' into 'develop'
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

5 years agoMerge branch 'chore/changelog-update' into 'develop'
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

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

5 years ago[#1033] Fix database migrations
Maksim [Mon, 1 Jul 2019 01:08:07 +0000 (01:08 +0000)]
[#1033] Fix database migrations

5 years agoUpdate changelog and admin API docs with tags, display_name, avatar additions
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

5 years agoOTP Release install docs: Remove --dry-run in cron certbot command
rinpatch [Sun, 30 Jun 2019 10:06:10 +0000 (13:06 +0300)]
OTP Release install docs: Remove --dry-run in cron certbot command

5 years agoMerge branch 'filter-user-statuses-by-hashtag' into 'develop'
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

5 years agoAdd hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
Eugenij [Sun, 30 Jun 2019 09:08:46 +0000 (09:08 +0000)]
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)

5 years agoMerge branch 'issues/1026' into 'develop'
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

5 years ago[#1026] Filter.AnonymizeFilename added ability to retain file extension with custom...
Maksim [Sun, 30 Jun 2019 07:28:35 +0000 (07:28 +0000)]
[#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text

5 years agoMerge branch 'fix/pin-unlisted' into 'develop'
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

5 years agoFix not being able to pin unlisted posts
rinpatch [Sat, 29 Jun 2019 19:24:03 +0000 (22:24 +0300)]
Fix not being able to pin unlisted posts

Closes #1038

5 years agoAdd PLEROMA_BUILD_ENV to override env for the version generator and use it in the...
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.

5 years agoMerge branch 'my-develop' into 'develop'
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

5 years agoAdd a caveat for docker deployment in the config docs
deorsum [Sat, 29 Jun 2019 10:39:03 +0000 (20:39 +1000)]
Add a caveat for docker deployment in the config docs

5 years agoMerge branch 'revert/tags-releases-develop' into 'develop'
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

5 years agoRevert "Build releases only on tags or develop"
rinpatch [Sat, 29 Jun 2019 10:27:15 +0000 (13:27 +0300)]
Revert "Build releases only on tags or develop"

This reverts commit 54d287377054fa48c5a14cf6b056cd80e838b264.

5 years agoMerge branch 'fix/no-untagged-builds-master' into 'develop'
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

5 years agoBuild releases only on tags or develop
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

5 years agoMerge branch 'fix/release-docs-path-warning' into 'develop'
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

5 years agoAdd a warning about service files assuming installation paths
rinpatch [Sat, 29 Jun 2019 08:35:42 +0000 (11:35 +0300)]
Add a warning about service files assuming installation paths

5 years agoMerge branch 'patch-3' into 'develop'
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

5 years agoMerge branch 'patch-2' into 'develop'
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

5 years agoMove all upload contents despite upload folder itself.
Yuji Nakao [Sat, 29 Jun 2019 04:24:44 +0000 (04:24 +0000)]
Move all upload contents despite upload folder itself.

5 years agoUpdate migrating_from_source_otp_en.md: Replace `reload-daemon` with `daemon-reload`.
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`.

5 years agoMerge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
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

5 years agoMerge branch 'feature/mrf-mediaproxy-warm' into 'develop'
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

5 years agotest: add tests for mediaproxy warming policy
William Pitcock [Fri, 28 Jun 2019 23:41:42 +0000 (23:41 +0000)]
test: add tests for mediaproxy warming policy

5 years agodocs: add documentation for MediaProxyWarmingPolicy
William Pitcock [Thu, 27 Jun 2019 21:34:27 +0000 (21:34 +0000)]
docs: add documentation for MediaProxyWarmingPolicy

5 years agoMRF: add mediaproxy warming policy
William Pitcock [Thu, 27 Jun 2019 03:06:58 +0000 (03:06 +0000)]
MRF: add mediaproxy warming policy

5 years agoMerge branch 'develop' into 'develop'
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

5 years agoUpdate docs/installation/arch_linux_en.md, docs/installation/centos7_en.md, docs...
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

5 years agoMerge branch 'release/1.0' into 'develop'
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

5 years agoMerge branch 'release-docs' into 'develop'
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

5 years agoBUMP OF CHICKEN
lain [Fri, 28 Jun 2019 15:15:44 +0000 (17:15 +0200)]
BUMP OF CHICKEN

1.0

5 years agoMerge branch '2019-06-29-pleromafe' into 'develop'
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

5 years agoUpdate frontend.
lain [Fri, 28 Jun 2019 12:29:26 +0000 (14:29 +0200)]
Update frontend.

5 years agoKowalski, analysis!
Maxim Filippov [Fri, 28 Jun 2019 12:27:18 +0000 (15:27 +0300)]
Kowalski, analysis!

5 years agoMerge admin and mastodon user views for reports
Maxim Filippov [Fri, 28 Jun 2019 12:15:32 +0000 (15:15 +0300)]
Merge admin and mastodon user views for reports

5 years agoAdd a note about the develop branch
rinpatch [Fri, 28 Jun 2019 06:41:34 +0000 (09:41 +0300)]
Add a note about the develop branch

5 years agoMerge branch 'fix/syslog-tag' into 'develop'
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

5 years agoAdd changelog entry for syslog tag change
Mark Felder [Thu, 27 Jun 2019 21:25:55 +0000 (16:25 -0500)]
Add changelog entry for syslog tag change

5 years agoIn my experience syslog tags are usually lowercase
Mark Felder [Thu, 27 Jun 2019 18:00:22 +0000 (13:00 -0500)]
In my experience syslog tags are usually lowercase

5 years agoAdd a note about OS/Distro packages in the readme
rinpatch [Thu, 27 Jun 2019 06:59:21 +0000 (09:59 +0300)]
Add a note about OS/Distro packages in the readme

5 years agoAdd a deprecation warning to the readme
rinpatch [Thu, 27 Jun 2019 06:51:00 +0000 (09:51 +0300)]
Add a deprecation warning to the readme

5 years agoAdd a note on what OTP releases are
rinpatch [Thu, 27 Jun 2019 06:45:13 +0000 (09:45 +0300)]
Add a note on what OTP releases are

5 years agoMerge branch 'idempotency-plug' into 'develop'
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

5 years agoMerge branch 'fix/admin-configure' into 'develop'
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

5 years agodon't delete config settings on admin update
Alexander Strizhakov [Thu, 27 Jun 2019 04:19:44 +0000 (04:19 +0000)]
don't delete config settings on admin update

5 years agoMerge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'
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

5 years agoUpdate mastofe to bundle-2019-06-26
Haelwenn (lanodan) Monnier [Wed, 26 Jun 2019 19:06:28 +0000 (21:06 +0200)]
Update mastofe to bundle-2019-06-26

5 years agoPolish IdempotencyPlug
Egor Kislitsyn [Wed, 26 Jun 2019 18:53:36 +0000 (01:53 +0700)]
Polish IdempotencyPlug

5 years agoInstructions on getting the flavour
rinpatch [Wed, 26 Jun 2019 12:24:06 +0000 (15:24 +0300)]
Instructions on getting the flavour

5 years agoDo not assume ~pleroma == /opt/pleroma
rinpatch [Wed, 26 Jun 2019 12:20:22 +0000 (15:20 +0300)]
Do not assume ~pleroma == /opt/pleroma

5 years agoFix credo warning
Egor Kislitsyn [Wed, 26 Jun 2019 12:19:07 +0000 (19:19 +0700)]
Fix credo warning

5 years agoRemove previous idempotency implementation from `post_status`
Egor Kislitsyn [Wed, 26 Jun 2019 11:49:14 +0000 (18:49 +0700)]
Remove previous idempotency implementation from `post_status`

5 years agoEnable IdempotencyPlug for the all API
Egor Kislitsyn [Wed, 26 Jun 2019 11:42:49 +0000 (18:42 +0700)]
Enable IdempotencyPlug for the all API

5 years agoAdd Idempotency plug
Egor Kislitsyn [Wed, 26 Jun 2019 11:36:42 +0000 (18:36 +0700)]
Add Idempotency plug

5 years agoMerge branch 'fix/handle-wrong-visibility-error' into 'develop'
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

5 years agoReturn correct response when reply to a direct message is not direct itself
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

5 years agoAdd all the remaining sections to Switching to OTP releases
rinpatch [Wed, 26 Jun 2019 08:34:58 +0000 (11:34 +0300)]
Add all the remaining sections to Switching to OTP releases

5 years agoMerge branch 'refactoring/fix_render_view' into 'develop'
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

5 years agoMerge branch 'feature/configurable-pack-extensions' into 'develop'
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

5 years agoMerge branch 'issues/1016' into 'develop'
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

5 years agoupdate changelog
Maksim Pechnikov [Wed, 26 Jun 2019 03:46:06 +0000 (06:46 +0300)]
update changelog

5 years agoMake default pack extensions configurable and default to png and gif
rinpatch [Wed, 26 Jun 2019 03:48:59 +0000 (06:48 +0300)]
Make default pack extensions configurable and default to png and gif

5 years agoApply suggestion to CHANGELOG.md
Maksim [Wed, 26 Jun 2019 03:43:53 +0000 (03:43 +0000)]
Apply suggestion to CHANGELOG.md

5 years agoupdate changelog
Maksim Pechnikov [Wed, 26 Jun 2019 03:39:50 +0000 (06:39 +0300)]
update changelog

5 years agofix validate_page_url
Maksim Pechnikov [Wed, 26 Jun 2019 03:24:12 +0000 (06:24 +0300)]
fix validate_page_url

5 years agoApply suggestion to docs/config.md
Maksim [Wed, 26 Jun 2019 03:23:26 +0000 (03:23 +0000)]
Apply suggestion to docs/config.md

5 years agoFix Controller.render/4 deprecation
Roman Chvanikov [Wed, 26 Jun 2019 00:27:37 +0000 (03:27 +0300)]
Fix Controller.render/4 deprecation

5 years agoadd ignore hosts and TLDs for rich_media
Maksim Pechnikov [Tue, 25 Jun 2019 19:25:37 +0000 (22:25 +0300)]
add ignore hosts and TLDs for rich_media

5 years agoadd test
Maksim Pechnikov [Tue, 25 Jun 2019 14:54:03 +0000 (17:54 +0300)]
add test

5 years agofix validate_url for private ip
Maksim Pechnikov [Tue, 25 Jun 2019 12:52:53 +0000 (15:52 +0300)]
fix validate_url for private ip

5 years agoAdd a note that OTP releases don't contain revision history
rinpatch [Tue, 25 Jun 2019 02:50:25 +0000 (05:50 +0300)]
Add a note that OTP releases don't contain revision history

5 years agoRemove the useless specification of test size and make the main points bold
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

5 years agoMerge branch 'issues/184' into 'develop'
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

5 years ago[#184] small refactoring reset password
Maksim [Mon, 24 Jun 2019 19:01:56 +0000 (19:01 +0000)]
[#184] small refactoring  reset password

5 years agoMerge branch 'feature/rework-user-deletion' into 'develop'
kaniini [Mon, 24 Jun 2019 18:59:12 +0000 (18:59 +0000)]
Merge branch 'feature/rework-user-deletion' into 'develop'

Rework user deletion

Closes #846

See merge request pleroma/pleroma!1308

5 years agoRework user deletion
Sergey Suprunenko [Mon, 24 Jun 2019 18:59:12 +0000 (18:59 +0000)]
Rework user deletion

5 years agoBasic skeleton of "Switching a from-source install to OTP releases"
rinpatch [Mon, 24 Jun 2019 08:51:02 +0000 (11:51 +0300)]
Basic skeleton of "Switching a from-source install to OTP releases"

5 years agoMerge branch 'conversation-update-on-dm-delete' into 'develop'
kaniini [Mon, 24 Jun 2019 07:14:04 +0000 (07:14 +0000)]
Merge branch 'conversation-update-on-dm-delete' into 'develop'

Broadcast conversation update when DM is deleted

Closes #1001

See merge request pleroma/pleroma!1311

5 years agoBroadcast conversation update when DM is deleted
Eugenij [Mon, 24 Jun 2019 07:14:04 +0000 (07:14 +0000)]
Broadcast conversation update when DM is deleted

5 years agoUse supervise-daemon(8) for the alpine service
rinpatch [Mon, 24 Jun 2019 07:08:33 +0000 (10:08 +0300)]
Use supervise-daemon(8) for the alpine service

5 years agoMerge branch 'modify-config.md-for-S3' into 'develop'
rinpatch [Mon, 24 Jun 2019 05:32:03 +0000 (05:32 +0000)]
Merge branch 'modify-config.md-for-S3' into 'develop'

Modify config.md for s3

See merge request pleroma/pleroma!1331

5 years agoApply suggestion to docs/config.md
aries [Mon, 24 Jun 2019 01:09:28 +0000 (01:09 +0000)]
Apply suggestion to docs/config.md

5 years agoRemove the warning about alpine as the issue is now solved
rinpatch [Sun, 23 Jun 2019 23:50:28 +0000 (02:50 +0300)]
Remove the warning about alpine as the issue is now solved

5 years agoMerge branch 'update/adminfe' into 'develop'
feld [Sun, 23 Jun 2019 22:46:21 +0000 (22:46 +0000)]
Merge branch 'update/adminfe' into 'develop'

Update adminFE to latest build

See merge request pleroma/pleroma!1333

5 years agoUpdate adminFE to latest build
Mark Felder [Sun, 23 Jun 2019 22:36:20 +0000 (18:36 -0400)]
Update adminFE to latest build

5 years agoFix markdown mistakes
aries [Sun, 23 Jun 2019 16:28:01 +0000 (01:28 +0900)]
Fix markdown mistakes

5 years agomodify config.md for S3
aries [Sun, 23 Jun 2019 16:10:55 +0000 (01:10 +0900)]
modify config.md for S3

5 years agoMerge branch 'bind-to-localhost' into 'develop'
kaniini [Sun, 23 Jun 2019 06:53:38 +0000 (06:53 +0000)]
Merge branch 'bind-to-localhost' into 'develop'

Bind to 127.0.0.1 instead of 0.0.0.0 by default

See merge request pleroma/pleroma!1329

5 years agoBind to 127.0.0.1 instead of 0.0.0.0 by default
rinpatch [Sun, 23 Jun 2019 06:31:39 +0000 (09:31 +0300)]
Bind to 127.0.0.1 instead of 0.0.0.0 by default

5 years agoMerge branch 'rich_media_titles_two' into 'develop'
kaniini [Sun, 23 Jun 2019 05:43:11 +0000 (05:43 +0000)]
Merge branch 'rich_media_titles_two' into 'develop'

Rich media titles two

See merge request pleroma/pleroma!1325

5 years agoMerge branch 'admin-config' into 'develop'
kaniini [Sun, 23 Jun 2019 05:42:37 +0000 (05:42 +0000)]
Merge branch 'admin-config' into 'develop'

Admin config

See merge request pleroma/pleroma!1328

5 years agoUse build-base instead of individual packages
rinpatch [Sun, 23 Jun 2019 05:35:35 +0000 (08:35 +0300)]
Use build-base instead of individual packages

5 years agolog capturing
Alex S [Sun, 23 Jun 2019 05:16:28 +0000 (08:16 +0300)]
log capturing