Commit Graph

182 Commits

Author SHA1 Message Date
Kyâne PICHOU
c70bab0f3a Upgrade to 4.0.1
Changelog here: https://docs.mattermost.com/administration/changelog.html#release-v4-0-1
2017-07-19 09:41:59 +02:00
Kyâne Pichou
0fddf35ac5 Merge pull request from mattermost/4.0
Update to 4.0.0
2017-07-16 10:42:06 +02:00
PICHOU Kyâne
9bb060fa07 Update to 4.0.0 2017-07-15 19:38:12 +02:00
Kyâne Pichou
c9a33c73bc Merge pull request from jnbt/master
Only configure database connection if needed
2017-07-11 09:25:37 +02:00
Jonas Thiel
56836d834c Only configure database connection if needed 2017-07-11 08:11:29 +02:00
Kyâne Pichou
7590cefb53 Do not hardcode/override MM_CONFIG value 2017-06-29 14:11:45 +02:00
Kyâne Pichou
09f6b6580a Fix docker-compose file 2017-06-23 14:57:51 +02:00
Kyâne Pichou
4ec6288dbb Merge pull request from mattermost/use_links
Use links instead of depends_on
2017-06-22 09:41:02 +02:00
Kyâne Pichou
5993e1f231 Use links instead of depends_on 2017-06-19 10:47:59 +02:00
Kyâne Pichou
944a4ea7de Drop docker-compose version 1 support
Close 
2017-06-19 10:38:18 +02:00
Kyâne Pichou
d3358cf2de Merge pull request from tejasbubane/mattermost-3.10
Upgrade to mattermost 3.10.0
2017-06-16 11:10:52 +02:00
Tejas Bubane
05a4fa19b2
Upgrade to mattermost 3.10.0 2017-06-15 13:15:29 +05:30
Pan Luo
9238aafd9e Merge pull request from mattermost/salted
Do not use hardcoded value for salts
2017-06-12 14:00:41 -07:00
PICHOU Kyâne
4a71713587 Directly generate salts when modifying config.json with JQ 2017-06-12 22:44:37 +02:00
PICHOU Kyâne
32c24cb08b Do not use hardcoded value for salts (thanks @pierreozoux) 2017-06-10 23:01:53 +02:00
Kyâne Pichou
16071fdc8f Merge pull request from mattermost/fixapp
Do not use env variables to override APP conf. (fix )
2017-06-10 18:19:47 +02:00
PICHOU Kyâne
87b26e155e Do not use env variables to override APP conf.
Since setting environment variables override and force a configuration parameters, it is better to not use them.
Should only override and force database configuration.

resolve 
2017-06-08 22:02:53 +02:00
Kyâne Pichou
9d5d84409d Fix typo in README 2017-06-08 11:13:10 +02:00
Kyâne Pichou
6512a09608 Improve app Dockerfile ()
* Improve app Dockerfile
2017-06-07 22:48:41 +02:00
Kyâne Pichou
2151040683 Merge pull request from mattermost/sort
Move AWS config to contrib folder
2017-06-07 08:52:50 +02:00
PICHOU Kyâne
c50cdfd6a0 Fix readme 2017-06-02 23:56:51 +02:00
PICHOU Kyâne
41c022a80b Move AWS conf to dedicated folder in contrib/ 2017-06-02 23:56:40 +02:00
Pichou Kyâne
e91e69401f Merge pull request from carlosasj/nginx-compatibility
Follows the NGINX Breaking Changes suggestion
2017-06-02 23:46:33 +02:00
Pichou Kyâne
5a022ac7c1 Merge pull request from Brightscout/master
Fix Dockerrun.aws.json so that it works with the latest docker setup
2017-06-02 20:23:38 +02:00
Carlos Schneider
15e7a9cd58 Fix X-Forwarded-Proto (PR suggestion) 2017-06-02 10:19:04 -03:00
Michael DeBonis
08006574fc Fixing AWS EB deployment 2017-06-01 23:40:33 -05:00
Michael DeBonis
16c5d0e217 Defaulting to team edition 2017-06-01 21:49:22 -05:00
Pan Luo
3b3825be65 Merge pull request from pichouk/patch-1
Do you want any help ?
2017-06-01 06:28:28 -07:00
Pan Luo
05f44e1413 Merge pull request from FingerLiu/master
fix build error on Ubuntu 14.04
2017-06-01 06:03:26 -07:00
Pichou Kyâne
3b210eabcf Help proposal 2017-06-01 10:50:36 +02:00
FingerLiu
bd49394e75 add libffi-dev 2017-05-31 11:40:12 +08:00
FingerLiu
307cf8f10a fix build error on Ubuntu 14.04
libssl-dev is needed to be installed on Ubuntu or the build won't be succeed.
2017-05-24 14:41:55 +08:00
Carlos Schneider
3ffc1056c7 Follows the NGINX Breaking Changes suggestion on Mattermost Changelog 2017-05-17 10:28:48 -03:00
Pan Luo
48a14edaca Merge pull request from carlosasj/upgrade-3.9.0
Upgrade to Mattermost 3.9.0
2017-05-17 01:12:44 -07:00
Carlos Schneider
ca43fe3961 Upgrade to Mattermost 3.9.0 2017-05-16 11:33:37 -03:00
Pan Luo
5586656959 Merge pull request from pichouk/master
Upgrade to Mattermost 3.8.2
2017-04-22 13:08:55 -07:00
PICHOU Kyâne
9e9be71ee4 Upgrade to Mattermost 3.8.2 2017-04-22 17:44:06 +02:00
Pan Luo
b1b8f83d7a Merge pull request from mattermost/3.8.1
Update Dockerfile to 3.8.1
2017-04-19 13:03:08 -07:00
Eric Sethna
484fc8d04c Update Dockerfile-enterprise 2017-04-19 13:50:10 -06:00
Eric Sethna
0ce37f1eb9 Update Dockerfile 2017-04-19 13:49:43 -06:00
Pan Luo
7a1a055056 Merge pull request from tejasbubane/upgrade-mattermost-3.8.0
Upgrade mattermost to 3.8.0
2017-04-19 12:14:48 -07:00
Tejas Bubane
b15521700e
Upgrade mattermost to 3.8.0 2017-04-15 12:18:12 +05:30
Pan Luo
a034f8f7ab
Fix the incorrect port in docker-compose 2017-03-26 00:35:45 -07:00
Pan Luo
d6eeccd422
Increase docker-compose up wait time in travis 2017-03-25 23:51:05 -07:00
Pan Luo
b252e9fed1
Update Mattermost EE to 3.7.3 2017-03-25 22:06:23 -07:00
Pan Luo
a29f94d497
Update to Mattermost 3.7.3 2017-03-22 16:52:48 -07:00
Pan Luo
a8b4e73882
Update to Mattermost 3.7.2 2017-03-19 21:46:05 -07:00
Pan Luo
fb268003cb
Update to Mattermost 3.7.1 2017-03-15 15:36:18 -07:00
Pan Luo
f0e0d92b3f
Update to Mattermost 3.6.3 2017-03-15 15:35:12 -07:00
Pan Luo
82f13b1e4c Move enterprise version into this branch ()
Since the only difference is mattermost package and  we don't want
to maintain two difference branches, just moved the enterprise version
into a alternative dockerfile
2017-03-13 15:26:45 -07:00