Commit graph

5818 commits

Author SHA1 Message Date
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
feld
b6af80f769 Revert "Merge branch 'fix/ogp-title' into 'develop'"
This reverts merge request !1277
2019-06-21 11:36:32 +00:00
Egor Kislitsyn
fc6e661672 Fix rate limiter tests 2019-06-21 16:47:16 +07:00
rinpatch
89fead9250 Default DB configuration to false and set the default database name to
`pleroma` instead of `pleroma_dev`
2019-06-21 06:42:04 +03:00
rinpatch
d55358f370 Merge branch 'develop' into release-docs 2019-06-21 06:41:13 +03:00
rinpatch
4bec121798 Do not set ownership group in chown commands 2019-06-21 06:39:03 +03:00
rinpatch
e824025c52 Remove a useless echo 2019-06-21 06:37:38 +03:00
rinpatch
16e9304cec Change to long adduser options because the short ones only work on busybox 2019-06-21 06:32:34 +03:00
rinpatch
4669a56aa3 Add notes on RUM indexes 2019-06-21 06:22:34 +03:00
rinpatch
f9515a3611 Add a note about RUM indexes package on Debian/Ubuntu 2019-06-21 06:14:02 +03:00
rinpatch
d3d98beaad Correct package names for Debian 2019-06-21 06:04:39 +03:00
rinpatch
267f6bedd8 Formatting 2019-06-21 05:57:46 +03:00
rinpatch
dd23888774 OTP release install guide sceleton 2019-06-21 05:48:13 +03:00
rinpatch
7e35bdbd3c Copy the nginx config to the release directory 2019-06-21 05:46:47 +03:00
rinpatch
ddf5e6254a Fix nginx webroot method config 2019-06-21 05:46:21 +03:00
rinpatch
2437f51284 Merge branch 'fix/config-gen-releases' into 'develop'
Refactor mix tasks a bit and make config generator work with releases

See merge request pleroma/pleroma!1312
2019-06-20 21:25:34 +00:00
lain
3b48876cf0 Merge branch 'fix/dynamic-configuration' into 'develop'
Fixes for dynamic configuration

See merge request pleroma/pleroma!1313
2019-06-20 17:43:57 +00:00
Alexander Strizhakov
32320c1ee9 Fixes for dynamic configuration 2019-06-20 17:43:57 +00:00
rinpatch
e3e8a7dc0e Disable rpc for instance gen 2019-06-20 18:28:56 +03:00
Ivan Tashkinov
f07003e218 Fixed mix version computed for underscore-containing branches to be of SemVer format. 2019-06-20 17:54:16 +03:00
rinpatch
45c67550f5 Merge branch 'develop' into fix/config-gen-releases 2019-06-20 11:51:16 +03:00
rinpatch
ba584364e9 Merge branch 'feature/release-update-script' into 'develop'
pleroma_ctl: add an update command

Closes #1004 and #988

See merge request pleroma/pleroma!1305
2019-06-20 08:50:26 +00:00
rinpatch
0e31d195af Apply suggestion to rel/files/bin/pleroma_ctl 2019-06-20 08:12:56 +00:00
rinpatch
4974988f03 Export PLEROMA_BUILD_BRANCH 2019-06-20 11:02:05 +03:00
William Pitcock
630ac6a921 docs: better description for mrf anti link spam 2019-06-20 03:01:03 +00:00
rinpatch
69070e641d Allow setting upload/static directories in the config generator 2019-06-20 03:59:16 +03:00
rinpatch
144e2e3e0b Remove deprecated dedupe_media from the config template 2019-06-20 03:40:00 +03:00
rinpatch
fe3a830b80 Remove a useless binding from config template call 2019-06-20 02:34:19 +03:00
rinpatch
f8c64dd4c0 Release Tasks: Ensure the application is loaded before getting the
modules

Needed for non-rpc tasks to work
2019-06-20 02:21:48 +03:00
rinpatch
8c7a382027 Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functions
instead of aliasing

This seems to be the convention for functions that can be reused between
different mix tasks in all Elixir projects I've seen and it gets rid on
an error message when someone runs mix pleroma.common

Also in this commit by accident:
- Move benchmark task under a proper namespace
- Insert a space after the prompt
2019-06-20 02:08:02 +03:00
rinpatch
524a66806d Merge branch 'user_sign_out_mix_task' into 'develop'
User sign out mix task

See merge request pleroma/pleroma!1309
2019-06-19 19:51:38 +00:00
Ivan Tashkinov
363618207c Apply suggestion to lib/mix/tasks/pleroma/user.ex 2019-06-19 19:39:53 +00:00
Ivan Tashkinov
71fb75b7ef User sign out mix task. 2019-06-19 22:29:36 +03:00
William Pitcock
21dacd4b15 unbreak polls 2019-06-19 16:33:49 +00:00
William Pitcock
736d8ad6be implement anti link spam MRF 2019-06-19 15:58:32 +00:00
rinpatch
2571e07fba pleroma_ctl: Rename arch to flavour because it also includes the libc 2019-06-19 14:59:18 +03:00
rinpatch
66f2cdcdb0 pleroma_ctl: add an update command
Closes #988 and #1004
2019-06-19 14:53:16 +03:00
rinpatch
a6e3169cfc Make possible to override the branch name via a env variable
This is useful for the CI builds because they have a detached HEAD or
for emulating a feature that is availible only on a particular branch
(e.g pleroma_ctl downloads CI artifacts only for develop and master)
2019-06-19 14:40:39 +03:00
rinpatch
cb4fcc740c Merge branch 'logger-level-for-migration-tasks' into 'develop'
Logger level for migration tasks

Closes #983

See merge request pleroma/pleroma!1295
2019-06-19 10:33:33 +00:00
Alexander Strizhakov
e4fa6b99ac aliases for mix tasks
ecto.migrate
ecto.rollback
2019-06-19 10:33:33 +00:00
rinpatch
df2dab69a7 Merge branch 'begone-the-dot-hack' into 'develop'
Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits

See merge request pleroma/pleroma!1298
2019-06-19 10:22:23 +00:00
lain
5c6c4ce634 Merge branch 'fix/rich-media-hashtags-again' into 'develop'
Rich Media: Skip Microformats hashtags

See merge request pleroma/pleroma!1304
2019-06-19 08:48:41 +00:00
lain
90e47d4357 Merge branch 'update-frontend-c4fcdc71' into 'develop'
Update bundled pleroma-fe to c4fcdc71

See merge request pleroma/pleroma!1303
2019-06-19 08:37:34 +00:00
rinpatch
a0a1361888 Refactor pleroma_ctl copying to a generic function for copying files into the release dir 2019-06-19 03:52:03 +03:00
rinpatch
035368d363 Rich Media: Skip Microformats hashtags
When fixing this problem I incorrectly assumed a.hashtag is
the proper way for detecting hashtags, but it is just something Pleroma and
Mastodon add. Per microformats it should be detected by the presense of rel=tag.

This MR adds a check for rel=tag, but I still left a.hashtag just in case
2019-06-19 00:46:30 +03:00
rinpatch
431a41b459 Update bundled pleroma-fe to c4fcdc71 2019-06-19 00:04:00 +03:00
lain
966317e052 Merge branch 'deps/update-auto-linker' into 'develop'
Deps: Update auto_linker

See merge request pleroma/pleroma!1300
2019-06-18 20:47:36 +00:00