aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-22Correct the psql commandrinpatch
2019-06-22Remove the getting started steps from pleroma.instance gen taskrinpatch
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-22Merge branch 'develop' into release-docsrinpatch
2019-06-21Merge branch 'feature/mrf-anti-link-spam' into 'develop'kaniini
implement anti link spam MRF See merge request pleroma/pleroma!1307
2019-06-21Merge branch 'fix/use-config-when-possible' into 'develop'rinpatch
use Config in generated config when available See merge request pleroma/pleroma!1319
2019-06-21Merge branch 'oauth_secure_redirect' into 'develop'kaniini
OAuth security improvements (`redirect_uri` listing enforcement) See merge request pleroma/pleroma!1302
2019-06-21Merge branch 'revert-6f5a0cc1' into 'develop'kaniini
Revert "Merge branch 'fix/ogp-title' into 'develop'" See merge request pleroma/pleroma!1317
2019-06-21change the anti-link-spam MRF implementation to use old_user? instead of the ↵William Pitcock
previous name
2019-06-21Merge branch 'fix-rate-limit-test' into 'develop'kaniini
Fix rate limiter tests See merge request pleroma/pleroma!1316
2019-06-21use Config in generated config when availablerinpatch
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-21Merge branch 'move-sample-configs' into 'develop'rinpatch
Move config templates to priv so they can be found in releases See merge request pleroma/pleroma!1318
2019-06-21Apply suggestion to docs/installation/releases_en.mdrinpatch
2019-06-21Apply suggestion to docs/installation/releases_en.mdrinpatch
2019-06-21Apply suggestion to docs/installation/releases_en.mdrinpatch
2019-06-21Move config templates to priv so they can be found in releasesrinpatch
2019-06-21Fixed branch name substitutions for mix version (to comply to SemVer format).Ivan Tashkinov
2019-06-21Revert "Merge branch 'fix/ogp-title' into 'develop'"feld
This reverts merge request !1277
2019-06-21Fix rate limiter testsEgor Kislitsyn
2019-06-21Default DB configuration to false and set the default database name torinpatch
`pleroma` instead of `pleroma_dev`
2019-06-21Merge branch 'develop' into release-docsrinpatch
2019-06-21Do not set ownership group in chown commandsrinpatch
2019-06-21Remove a useless echorinpatch
2019-06-21Change to long adduser options because the short ones only work on busyboxrinpatch
2019-06-21Add notes on RUM indexesrinpatch
2019-06-21Add a note about RUM indexes package on Debian/Ubunturinpatch
2019-06-21Correct package names for Debianrinpatch
2019-06-21Formattingrinpatch
2019-06-21OTP release install guide sceletonrinpatch
2019-06-21Copy the nginx config to the release directoryrinpatch
2019-06-21Fix nginx webroot method configrinpatch
2019-06-20Merge branch 'fix/config-gen-releases' into 'develop'rinpatch
Refactor mix tasks a bit and make config generator work with releases See merge request pleroma/pleroma!1312
2019-06-20Merge branch 'fix/dynamic-configuration' into 'develop'lain
Fixes for dynamic configuration See merge request pleroma/pleroma!1313
2019-06-20Fixes for dynamic configurationAlexander Strizhakov
2019-06-20Disable rpc for instance genrinpatch
2019-06-20Fixed mix version computed for underscore-containing branches to be of ↵Ivan Tashkinov
SemVer format.
2019-06-20Merge branch 'develop' into fix/config-gen-releasesrinpatch
2019-06-20Merge branch 'feature/release-update-script' into 'develop'rinpatch
pleroma_ctl: add an update command Closes #1004 and #988 See merge request pleroma/pleroma!1305
2019-06-20Apply suggestion to rel/files/bin/pleroma_ctlrinpatch
2019-06-20Export PLEROMA_BUILD_BRANCHrinpatch
2019-06-20docs: better description for mrf anti link spamWilliam Pitcock
2019-06-20Allow setting upload/static directories in the config generatorrinpatch
2019-06-20Remove deprecated dedupe_media from the config templaterinpatch
2019-06-20Remove a useless binding from config template callrinpatch
2019-06-20Release Tasks: Ensure the application is loaded before getting therinpatch
modules Needed for non-rpc tasks to work
2019-06-20Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functionsrinpatch
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-19Merge branch 'user_sign_out_mix_task' into 'develop'rinpatch
User sign out mix task See merge request pleroma/pleroma!1309
2019-06-19Apply suggestion to lib/mix/tasks/pleroma/user.exIvan Tashkinov
2019-06-19User sign out mix task.Ivan Tashkinov
2019-06-19unbreak pollsWilliam Pitcock
2019-06-19implement anti link spam MRFWilliam Pitcock