diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-04-02 13:13:33 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-04-02 13:13:33 +0300 |
| commit | 5bf43319c9963f89ff30dd5c0e63854450c41964 (patch) | |
| tree | 291b5c1b39a3551f0a1fce67b90b58752d77852f /CHANGELOG.md | |
| parent | 823aea497b45652e1c57916a10094cb5b0fc3ef9 (diff) | |
| parent | dfeeec308ac2c683cd3fc3f43f65efe71072af54 (diff) | |
| download | wekan-5bf43319c9963f89ff30dd5c0e63854450c41964.tar.gz wekan-5bf43319c9963f89ff30dd5c0e63854450c41964.tar.bz2 wekan-5bf43319c9963f89ff30dd5c0e63854450c41964.zip | |
Merge branch 'Zokormazo-email' into devel
MAIL_URL was overriden with database info all the time.
Now if MAIL_URL exists is not overwritten and if neither MAIL_URL nor
exists valid admin panel data MAIL_URL is not set.
MAIL_FROM was ignored. Same behaviour, env variable has bigger priority
than database configuration.
On both cases, althrought environment variable is set, updating admin-panel
mail settings will load new info and ignore the environment variable.
Remove some code that is not needed anymore.
This fixes #951, fixes #948, and fixes #937
Diffstat (limited to 'CHANGELOG.md')
0 files changed, 0 insertions, 0 deletions