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 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.
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
Maksim [Mon, 24 Jun 2019 19:01:56 +0000 (19:01 +0000)]
[#184] small refactoring reset password
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
Sergey Suprunenko [Mon, 24 Jun 2019 18:59:12 +0000 (18:59 +0000)]
Rework user deletion
rinpatch [Mon, 24 Jun 2019 08:51:02 +0000 (11:51 +0300)]
Basic skeleton of "Switching a from-source install to OTP releases"
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
Eugenij [Mon, 24 Jun 2019 07:14:04 +0000 (07:14 +0000)]
Broadcast conversation update when DM is deleted
rinpatch [Mon, 24 Jun 2019 07:08:33 +0000 (10:08 +0300)]
Use supervise-daemon(8) for the alpine service
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
aries [Mon, 24 Jun 2019 01:09:28 +0000 (01:09 +0000)]
Apply suggestion to docs/config.md
rinpatch [Sun, 23 Jun 2019 23:50:28 +0000 (02:50 +0300)]
Remove the warning about alpine as the issue is now solved
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
Mark Felder [Sun, 23 Jun 2019 22:36:20 +0000 (18:36 -0400)]
Update adminFE to latest build
aries [Sun, 23 Jun 2019 16:28:01 +0000 (01:28 +0900)]
Fix markdown mistakes
aries [Sun, 23 Jun 2019 16:10:55 +0000 (01:10 +0900)]
modify config.md for S3
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
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
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
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
rinpatch [Sun, 23 Jun 2019 05:35:35 +0000 (08:35 +0300)]
Use build-base instead of individual packages
Alex S [Sun, 23 Jun 2019 05:16:28 +0000 (08:16 +0300)]
log capturing
Alex S [Sun, 23 Jun 2019 05:16:16 +0000 (08:16 +0300)]
support for config groups
rinpatch [Sun, 23 Jun 2019 04:44:10 +0000 (07:44 +0300)]
releases_en.md -> otp_en.md
rinpatch [Sun, 23 Jun 2019 04:43:45 +0000 (07:43 +0300)]
Add a Further Reading section to the OTP install guide
rinpatch [Sun, 23 Jun 2019 04:39:23 +0000 (07:39 +0300)]
Remove sudo in the nginx config command example
rinpatch [Sun, 23 Jun 2019 00:05:02 +0000 (03:05 +0300)]
Add a section on executing mix tasks
rinpatch [Sat, 22 Jun 2019 23:55:43 +0000 (02:55 +0300)]
Add a section about updating
rinpatch [Sat, 22 Jun 2019 23:42:47 +0000 (02:42 +0300)]
Add docs about SSL certificate auto-renew
rinpatch [Sat, 22 Jun 2019 18:18:34 +0000 (21:18 +0300)]
Remove a note about needing to add RUM to config manually, as it is now
in the config generator
Haelwenn [Sat, 22 Jun 2019 17:44:06 +0000 (17:44 +0000)]
Merge branch 'docs/remove-tootdon' into 'develop'
docs/clients.md: Remove tootdon
See merge request pleroma/pleroma!1326
Haelwenn [Sat, 22 Jun 2019 17:38:04 +0000 (17:38 +0000)]
Merge branch 'feature/rum-config-generator' into 'develop'
Support RUM indexes in the config generator
See merge request pleroma/pleroma!1324
Haelwenn (lanodan) Monnier [Sat, 22 Jun 2019 17:24:21 +0000 (19:24 +0200)]
docs/clients.md: Remove tootdon
Of course a proprietary client would send the messages home :D
rinpatch [Sat, 22 Jun 2019 17:26:59 +0000 (20:26 +0300)]
Fix the webroot method in the nginx config
Alex S [Sat, 22 Jun 2019 14:30:53 +0000 (17:30 +0300)]
support for tuples with more than 2 values
lain [Sat, 22 Jun 2019 14:22:59 +0000 (16:22 +0200)]
Rich Media Parser: Do not return just a title if nothing else is there.
lain [Sat, 22 Jun 2019 13:12:57 +0000 (15:12 +0200)]
Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
This reverts commit
b6af80f769195b5047ee8da07166f022c2e29b0a.
rinpatch [Sat, 22 Jun 2019 10:40:37 +0000 (13:40 +0300)]
Add a warning about OTP releases on Alpine 3.10
rinpatch [Sat, 22 Jun 2019 10:24:33 +0000 (13:24 +0300)]
Add an OpenRC service for OTP releases
rinpatch [Sat, 22 Jun 2019 09:54:16 +0000 (12:54 +0300)]
Support RUM indexes in the config generator
rinpatch [Sat, 22 Jun 2019 09:44:20 +0000 (12:44 +0300)]
Merge branch 'develop' into release-docs
rinpatch [Sat, 22 Jun 2019 09:20:11 +0000 (09:20 +0000)]
Merge branch 'mix_sem_ver_version_fix' into 'develop'
Fixed mix version computed for underscore-containing branches
See merge request pleroma/pleroma!1314
rinpatch [Sat, 22 Jun 2019 09:19:10 +0000 (09:19 +0000)]
Merge branch 'fix/ecto-tasks-release' into 'develop'
Ecto tasks: Resolve relative path using the application directory instead of cwd and load the application before doing anything
See merge request pleroma/pleroma!1322
rinpatch [Sat, 22 Jun 2019 06:55:32 +0000 (06:55 +0000)]
Merge branch 'bugfix/simple-notifications-for-non-create-activities' into 'develop'
notifications: fix notification generation for non-create activities
See merge request pleroma/pleroma!1323
William Pitcock [Sat, 22 Jun 2019 06:44:47 +0000 (06:44 +0000)]
notifications: fix notification generation for non-create activities
in
300d94c62, an Object.normalize() call was introduced. calling Object.normalize()
on an activity with a non-object URI (say, a user) causes Really Bad Things to happen.
so don't do that.
Alex S [Sat, 22 Jun 2019 06:01:30 +0000 (09:01 +0300)]
fix for int and modules
rinpatch [Sat, 22 Jun 2019 05:36:36 +0000 (08:36 +0300)]
Correct dependencies for RUM on alpine and remove installcheck
rinpatch [Sat, 22 Jun 2019 05:31:02 +0000 (08:31 +0300)]
Correct a typo in the apk command
rinpatch [Sat, 22 Jun 2019 05:30:32 +0000 (08:30 +0300)]
Do not exit on fail in the one-liner because it closes ssh connection and fix dependencies for alpine
rinpatch [Sat, 22 Jun 2019 02:20:36 +0000 (05:20 +0300)]
Use uname -m instead of arch for more portability
rinpatch [Sat, 22 Jun 2019 02:00:41 +0000 (05:00 +0300)]
Add a systemd service for OTP releases
rinpatch [Sat, 22 Jun 2019 01:35:17 +0000 (04:35 +0300)]
Executing create is unnecessary after the postgres script is executed
rinpatch [Sat, 22 Jun 2019 01:33:46 +0000 (04:33 +0300)]
Load the application before executing the create task
rinpatch [Sat, 22 Jun 2019 01:17:04 +0000 (04:17 +0300)]
Ecto tasks: Resolve relative path using the application directory
instead of cwd and load the application before doing anything
In OTP releases cwd != app directory and the configuration is read
only if the application is loaded
kaniini [Fri, 21 Jun 2019 23:54:37 +0000 (23:54 +0000)]
Merge branch 'chore/update-bbcode' into 'develop'
mix: update bbcode dependency to v0.1.1
See merge request pleroma/pleroma!1321
rinpatch [Fri, 21 Jun 2019 23:43:14 +0000 (23:43 +0000)]
Merge branch 'fix/fallback-config' into 'develop'
Fallback to Config if Mix.Config does not exist, even if Config does not exist either
See merge request pleroma/pleroma!1320
William Pitcock [Fri, 21 Jun 2019 23:42:50 +0000 (23:42 +0000)]
mix: update bbcode dependency to v0.1.1
rinpatch [Fri, 21 Jun 2019 23:29:49 +0000 (02:29 +0300)]
Fallback to Config if Mix.Config does not exist, even if Config does not
exist either
For some weird reason Code.ensure_loaded?(Config) is false on OTP
releases even though `use Config` from config files works just fine.
rinpatch [Fri, 21 Jun 2019 23:20:55 +0000 (02:20 +0300)]
Execute migration commands as the pleroma user and add a note about the need to uncomment the RUM command
rinpatch [Fri, 21 Jun 2019 23:09:45 +0000 (02:09 +0300)]
Correct the psql command
rinpatch [Fri, 21 Jun 2019 23:07:05 +0000 (02:07 +0300)]
Remove the getting started steps from pleroma.instance gen task
They are not compatible with every platform, different for OTP releases
and may become outdated. We are better off just telling people to refer
to the installation guides for their particular platform