Commit Graph

5823 Commits

Author SHA1 Message Date
rinpatch 57d18b06ab Remove the useless specification of test size and make the main points bold 2019-06-25 04:55:41 +03:00
kaniini d80859731e Merge branch 'issues/184' into 'develop'
[#184] small refactoring  reset password

See merge request pleroma/pleroma!1301
2019-06-24 19:01:56 +00:00
Maksim a0c4ebb4d7 [#184] small refactoring reset password 2019-06-24 19:01:56 +00:00
kaniini 1ab8a9e4fe Merge branch 'feature/rework-user-deletion' into 'develop'
Rework user deletion

Closes #846

See merge request pleroma/pleroma!1308
2019-06-24 18:59:12 +00:00
Sergey Suprunenko 2c63c67512 Rework user deletion 2019-06-24 18:59:12 +00:00
rinpatch 687f0aee51 Basic skeleton of "Switching a from-source install to OTP releases" 2019-06-24 11:51:02 +03:00
kaniini 0f07bcc9e3 Merge branch 'conversation-update-on-dm-delete' into 'develop'
Broadcast conversation update when DM is deleted

Closes #1001

See merge request pleroma/pleroma!1311
2019-06-24 07:14:04 +00:00
Eugenij f2c03425b0 Broadcast conversation update when DM is deleted 2019-06-24 07:14:04 +00:00
rinpatch 5b76c3141f Use supervise-daemon(8) for the alpine service 2019-06-24 10:08:33 +03:00
rinpatch 58d567ddc5 Merge branch 'modify-config.md-for-S3' into 'develop'
Modify config.md for s3

See merge request pleroma/pleroma!1331
2019-06-24 05:32:03 +00:00
aries 550302c041 Apply suggestion to docs/config.md 2019-06-24 01:09:28 +00:00
rinpatch 7fc226e0fe Remove the warning about alpine as the issue is now solved 2019-06-24 02:50:28 +03:00
feld 826d0424c1 Merge branch 'update/adminfe' into 'develop'
Update adminFE to latest build

See merge request pleroma/pleroma!1333
2019-06-23 22:46:21 +00:00
Mark Felder 7b9e21e8a2 Update adminFE to latest build 2019-06-23 18:36:20 -04:00
aries 7daaaf84f1 Fix markdown mistakes 2019-06-24 01:28:01 +09:00
aries 4bac13966b modify config.md for S3 2019-06-24 01:10:55 +09:00
kaniini 48174dc290 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
2019-06-23 06:53:38 +00:00
rinpatch 875100de01 Bind to 127.0.0.1 instead of 0.0.0.0 by default 2019-06-23 09:31:39 +03:00
kaniini 27b9605de0 Merge branch 'rich_media_titles_two' into 'develop'
Rich media titles two

See merge request pleroma/pleroma!1325
2019-06-23 05:43:11 +00:00
kaniini 8b7860f12f Merge branch 'admin-config' into 'develop'
Admin config

See merge request pleroma/pleroma!1328
2019-06-23 05:42:37 +00:00
rinpatch 40a62839ff Use build-base instead of individual packages 2019-06-23 08:35:35 +03:00
Alex S b37ede5df3 log capturing 2019-06-23 08:16:28 +03:00
Alex S 982cad0268 support for config groups 2019-06-23 08:16:16 +03:00
rinpatch 1d3c5e434d releases_en.md -> otp_en.md 2019-06-23 07:44:10 +03:00
rinpatch 66e92dc0ca Add a Further Reading section to the OTP install guide 2019-06-23 07:43:45 +03:00
rinpatch 997e766929 Remove sudo in the nginx config command example 2019-06-23 07:39:23 +03:00
Sachin Joshi a0c65bbd6c Merge branch 'develop' into 'remove-avatar-header'
# Conflicts:
#   CHANGELOG.md
2019-06-23 03:25:50 +00:00
rinpatch 299cefa2bd Add a section on executing mix tasks 2019-06-23 03:05:02 +03:00
rinpatch 18eabca978 Add a section about updating 2019-06-23 02:55:43 +03:00
rinpatch 9d487ba579 Add docs about SSL certificate auto-renew 2019-06-23 02:42:53 +03:00
rinpatch 7a4c4518b8 Remove a note about needing to add RUM to config manually, as it is now
in the config generator
2019-06-22 21:18:34 +03:00
Haelwenn 72f365df07 Merge branch 'docs/remove-tootdon' into 'develop'
docs/clients.md: Remove tootdon

See merge request pleroma/pleroma!1326
2019-06-22 17:44:06 +00:00
Haelwenn 066f4622d6 Merge branch 'feature/rum-config-generator' into 'develop'
Support RUM indexes in the config generator

See merge request pleroma/pleroma!1324
2019-06-22 17:38:04 +00:00
Haelwenn (lanodan) Monnier ab79a18b77
docs/clients.md: Remove tootdon
Of course a proprietary client would send the messages home :D
2019-06-22 19:34:30 +02:00
rinpatch c013d3f3c8 Fix the webroot method in the nginx config 2019-06-22 20:26:59 +03:00
Alex S 410add1c30 support for tuples with more than 2 values 2019-06-22 17:30:53 +03:00
lain 0e415921cd Rich Media Parser: Do not return just a title if nothing else is there. 2019-06-22 16:22:59 +02:00
lain 58c4d5312b Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
This reverts commit b6af80f769.
2019-06-22 15:12:57 +02:00
rinpatch e00e4c0e7a Add a warning about OTP releases on Alpine 3.10 2019-06-22 13:41:17 +03:00
rinpatch bb40c33dd6 Add an OpenRC service for OTP releases 2019-06-22 13:24:33 +03:00
rinpatch 3ac5ecbac1 Support RUM indexes in the config generator 2019-06-22 12:54:16 +03:00
rinpatch 51760c84b9 Merge branch 'develop' into release-docs 2019-06-22 12:44:20 +03:00
rinpatch 8dbcff2fed Merge branch 'mix_sem_ver_version_fix' into 'develop'
Fixed mix version computed for underscore-containing branches

See merge request pleroma/pleroma!1314
2019-06-22 09:20:11 +00:00
rinpatch 53c73cd1a3 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
2019-06-22 09:19:10 +00:00
rinpatch 4b791afd60 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
2019-06-22 06:55:32 +00:00
William Pitcock 6426301407 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.
2019-06-22 06:44:47 +00:00
Alex S f0fccb7578 fix for int and modules 2019-06-22 09:01:30 +03:00
rinpatch 177faf15c2 Correct dependencies for RUM on alpine and remove installcheck 2019-06-22 08:36:36 +03:00
rinpatch 50e3cf9d5e Correct a typo in the apk command 2019-06-22 08:31:02 +03:00
rinpatch dd05dc65d3 Do not exit on fail in the one-liner because it closes ssh connection and fix dependencies for alpine 2019-06-22 08:30:32 +03:00