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
rinpatch
1d2332ce79
Use uname -m instead of arch for more portability
2019-06-22 05:20:36 +03:00
rinpatch
38a803a1f8
Add a systemd service for OTP releases
2019-06-22 05:00:41 +03:00
rinpatch
120f84c83d
Executing create is unnecessary after the postgres script is executed
2019-06-22 04:35:22 +03:00
rinpatch
19f16e829d
Load the application before executing the create task
2019-06-22 04:33:46 +03:00
rinpatch
ebee9f59d8
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
2019-06-22 04:17:04 +03:00
kaniini
ddd04d1c52
Merge branch 'chore/update-bbcode' into 'develop'
...
mix: update bbcode dependency to v0.1.1
See merge request pleroma/pleroma!1321
2019-06-21 23:54:37 +00:00
rinpatch
cf94b813e5
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
2019-06-21 23:43:14 +00:00
William Pitcock
481932309f
mix: update bbcode dependency to v0.1.1
2019-06-21 23:42:50 +00:00
rinpatch
f4009b6706
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.
2019-06-22 02:29:49 +03:00
rinpatch
23608149bc
Execute migration commands as the pleroma user and add a note about the need to uncomment the RUM command
2019-06-22 02:21:02 +03:00
rinpatch
d1d648b0ec
Correct the psql command
2019-06-22 02:09:45 +03:00
rinpatch
ee4e7c6570
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
2019-06-22 02:07:05 +03:00
rinpatch
452d5d3231
Merge branch 'develop' into release-docs
2019-06-22 02:00:18 +03:00
kaniini
55742d978d
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
...
implement anti link spam MRF
See merge request pleroma/pleroma!1307
2019-06-21 22:56:54 +00:00
rinpatch
89fa14f558
Merge branch 'fix/use-config-when-possible' into 'develop'
...
use Config in generated config when available
See merge request pleroma/pleroma!1319
2019-06-21 22:43:39 +00:00
kaniini
e3534f5b3c
Merge branch 'oauth_secure_redirect' into 'develop'
...
OAuth security improvements (`redirect_uri` listing enforcement)
See merge request pleroma/pleroma!1302
2019-06-21 22:31:12 +00:00
kaniini
720412bf24
Merge branch 'revert-6f5a0cc1' into 'develop'
...
Revert "Merge branch 'fix/ogp-title' into 'develop'"
See merge request pleroma/pleroma!1317
2019-06-21 22:28:46 +00:00
William Pitcock
127a5a7d65
change the anti-link-spam MRF implementation to use old_user? instead of the previous name
2019-06-21 22:27:14 +00:00
kaniini
4d69d066c4
Merge branch 'fix-rate-limit-test' into 'develop'
...
Fix rate limiter tests
See merge request pleroma/pleroma!1316
2019-06-21 22:25:09 +00:00
rinpatch
960d6b54e8
use Config in generated config when available
...
Mix.Config is deprecated and does not work on OTP releases. However
we can't fully switch to Config because it is not present in
Elixir < 1.9. I tried to evaluate if Config is available at runtime,
but for some weird reason OTP releases crash if I do that.
2019-06-21 22:01:59 +03:00
rinpatch
6906db512d
Merge branch 'move-sample-configs' into 'develop'
...
Move config templates to priv so they can be found in releases
See merge request pleroma/pleroma!1318
2019-06-21 17:27:00 +00:00
rinpatch
743bd64883
Apply suggestion to docs/installation/releases_en.md
2019-06-21 17:00:12 +00:00
rinpatch
de77d7621a
Apply suggestion to docs/installation/releases_en.md
2019-06-21 16:59:56 +00:00
rinpatch
8b170b96c7
Apply suggestion to docs/installation/releases_en.md
2019-06-21 16:59:48 +00:00
rinpatch
e76115989a
Move config templates to priv so they can be found in releases
2019-06-21 19:54:04 +03:00
Ivan Tashkinov
259ffe0062
Fixed branch name substitutions for mix version (to comply to SemVer format).
2019-06-21 17:19:29 +03:00