Commit graph

13 commits

Author SHA1 Message Date
Egor Kislitsyn 8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock
2018-12-06 19:55:58 +07:00
Egor Kislitsyn 04a48286e6 Add web push support 2018-12-06 19:29:04 +07:00
Haelwenn (lanodan) Monnier 8b2541e4e7
Document the mix tasks in ex_doc instead 2018-11-10 13:09:37 +01:00
lain 77fc40d5d7 Fix generate config 2018-04-19 12:52:24 +02:00
eal e30a056476 Revert "Ask for proxy URL if proxy enabled."
The most common case is running it on the same server.
2018-04-19 13:29:14 +03:00
lain 4afbef39f4 Format the code. 2018-03-30 15:01:53 +02:00
eal d56ab43609 Ask for proxy URL if proxy enabled.
Also change the true/false question to y/n
2018-01-12 22:38:14 +02:00
Sebastian Huebner 29b7e822fb
added question about activating mediaproxy to config generator 2018-01-09 12:31:11 +01:00
Henry Jameson 071f518028 reverts config gen 2017-12-04 03:56:54 +03:00
Henry Jameson a884e08271 fix 2017-12-04 03:56:54 +03:00
Henry Jameson 4071403117 fixes 2017-12-04 03:56:54 +03:00
Henry Jameson 0673511d39 first version of safe DB setup 2017-12-04 03:56:54 +03:00
Lain Iwakura 44dc694882 Add configuration generation tool, update readme. 2017-11-23 16:22:20 +01:00