Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed Invite Members to Add Members in channel options for mobile and browser | Reed Garmsen | 2015-06-17 | 2 | -2/+2 |
| | |||||
* | Merge pull request #7 from mattermost/master | Reed Garmsen | 2015-06-17 | 2 | -4/+4 |
|\ | | | | | to me | ||||
| * | Merge pull request #25 from rgarmsen2295/mm-1064 | Corey Hulen | 2015-06-17 | 2 | -4/+4 |
| |\ | | | | | | | MM-1064 | ||||
| | * | Merge pull request #6 from rgarmsen2295/master | Reed Garmsen | 2015-06-17 | 9 | -54/+167 |
| | |\ | |_|/ |/| | | Remerging | ||||
* | | | Merge pull request #5 from mattermost/master | Reed Garmsen | 2015-06-17 | 9 | -55/+168 |
|\| | | | | | | | | to me | ||||
| * | | Merge pull request #22 from mattermost/mention-fix | Corey Hulen | 2015-06-17 | 1 | -1/+1 |
| |\ \ | | | | | | | | | fix an auto-complete bug for mentions MERGE FOR HELIUM RELEASE | ||||
| | * | | fix an auto-complete bug for mentions | JoramWilander | 2015-06-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #21 from mattermost/mm-1225 | Corey Hulen | 2015-06-17 | 2 | -32/+71 |
| |\ \ \ | | | | | | | | | | | MM-1225 Adding check of email configuation settings when config file is loaded | ||||
| | * | | | Adding check of email configuation settings when config file is loaded | Christopher Speller | 2015-06-17 | 2 | -32/+71 |
| | |/ / | |||||
| * | | | Merge pull request #20 from mattermost/docker-tweaks | Corey Hulen | 2015-06-17 | 6 | -22/+96 |
| |\ \ \ | | |/ / | |/| | | MM-1157 Various tweaks to docker requested. HELIUM | ||||
| | * | | Resurrecting config_docker.json. Moving docker related files to docker ↵ | Christopher Speller | 2015-06-17 | 6 | -22/+96 |
| |/ / | | | | | | | | | | directory. Added copyright info. | ||||
| | * | Fixing compatibility | Reed Garmsen | 2015-06-17 | 1 | -0/+1 |
| | | | |||||
| | * | Merge branch 'mm-1064' of https://github.com/rgarmsen2295/platform into mm-1064 | Reed Garmsen | 2015-06-17 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Removed unnecessary comma | Reed Garmsen | 2015-06-17 | 1 | -1/+1 |
| | | | | |||||
| | | * | Simplified code changes | Reed Garmsen | 2015-06-17 | 3 | -5/+2 |
| | | | | |||||
| | | * | Merge pull request #4 from rgarmsen2295/master | Reed Garmsen | 2015-06-17 | 13 | -17/+331 |
| | | |\ | |_|_|/ |/| | | | Sanity check | ||||
| | | * | Added in basic changes necessary to fix some typos. Needs further tests and ↵ | Reed Garmsen | 2015-06-16 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | changes to other config files | ||||
| | * | | Removed unnecessary comma | Reed Garmsen | 2015-06-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Simplified code changes | Reed Garmsen | 2015-06-17 | 3 | -5/+2 |
| | | | | |||||
| | * | | Added in basic changes necessary to fix some typos. Needs further tests and ↵ | Reed Garmsen | 2015-06-17 | 2 | -5/+7 |
| |/ / |/| | | | | | | | | changes to other config files | ||||
* | | | Merge pull request #3 from mattermost/master | Reed Garmsen | 2015-06-17 | 13 | -17/+331 |
|\| | | |/ |/| | to me | ||||
| * | fixing ubild | =Corey Hulen | 2015-06-16 | 1 | -1/+1 |
| | | |||||
| * | Fixing build | =Corey Hulen | 2015-06-16 | 1 | -0/+2 |
| | | |||||
| * | Merge pull request #17 from mattermost/fixing-build | Corey Hulen | 2015-06-16 | 2 | -7/+11 |
| |\ | | | | | | | Fixing build | ||||
| | * | Fixing build | =Corey Hulen | 2015-06-16 | 2 | -7/+11 |
| |/ | |||||
| * | changing port back | =Corey Hulen | 2015-06-16 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #16 from mattermost/mm-1157 | Corey Hulen | 2015-06-16 | 4 | -6/+264 |
| |\ | | | | | | | MM-1157 Docker file and related configurations | ||||
| | * | Using config.json instead of config_docker.json for docker. Note, this will ↵ | Christopher Speller | 2015-06-16 | 3 | -91/+10 |
| | | | | | | | | | | | | break local dev builds. | ||||
| | * | Modifications for sending local mail | Christopher Speller | 2015-06-16 | 4 | -4/+54 |
| | | | |||||
| | * | Adding Dockerfile and releated configs | Christopher Speller | 2015-06-16 | 3 | -0/+289 |
| | | | |||||
| * | | Merge pull request #15 from mattermost/enviroment-override | Corey Hulen | 2015-06-16 | 2 | -0/+20 |
| |\ \ | | |/ | |/| | Allow for setting of domain with enviroment variable | ||||
| | * | Allow for setting of domain with enviroment variable | Christopher Speller | 2015-06-16 | 2 | -0/+20 |
| | | | |||||
| * | | Merge pull request #14 from mattermost/mm-1294 | Corey Hulen | 2015-06-16 | 3 | -3/+15 |
| |\ \ | | |/ | |/| | MM-1294 - Parsing homelink from URL instead of using config setting. | ||||
| | * | Fixing link | Christopher Speller | 2015-06-16 | 1 | -2/+2 |
| | | | |||||
| | * | Switching from config file to parsing homelink from url | Christopher Speller | 2015-06-16 | 3 | -3/+15 |
| |/ | |||||
| * | fixing unit test | =Corey Hulen | 2015-06-16 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of https://github.com/mattermost/platform | =Corey Hulen | 2015-06-16 | 2 | -1/+3 |
| |\ | |||||
| | * | Merge pull request #12 from mattermost/mm-1285 | Corey Hulen | 2015-06-16 | 2 | -1/+3 |
| | |\ | | | | | | | | | fixes mm-1218 adds sentence describing username to sign up pages | ||||
| | | * | fixes mm-1218 adds sentence describing username to sign up pages | JoramWilander | 2015-06-16 | 2 | -1/+3 |
| | | | | |||||
| * | | | changing unit test | =Corey Hulen | 2015-06-16 | 1 | -1/+4 |
| |/ / | |||||
| * | | Merge pull request #11 from mattermost/mm-1228 | Corey Hulen | 2015-06-16 | 3 | -8/+21 |
| |\ \ | | | | | | | | | MM-1228 - Ability to use local mail config. | ||||
| | * | | Modifying sendmail to allow for non-encrypted connection for ease setup of ↵ | Christopher Speller | 2015-06-15 | 3 | -8/+21 |
| | | | | | | | | | | | | | | | | local mail sender | ||||
| * | | | Merge pull request #10 from mattermost/mm-1251 | Corey Hulen | 2015-06-16 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | fixes mm-1251 updates sign up now link | ||||
| | * | | fixes mm-1251 updates sign up now link | JoramWilander | 2015-06-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2 from mattermost/master | Reed Garmsen | 2015-06-16 | 4 | -50/+252 |
|\| | | | | | | | | | | | to me | ||||
| * | | | Update README.md | it33 | 2015-06-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update README.md | it33 | 2015-06-16 | 1 | -3/+3 |
| | | | | |||||
| * | | | Reducing number of steps in Mattermost Setup | it33 | 2015-06-16 | 1 | -13/+10 |
| | | | | |||||
| * | | | Update README.md | it33 | 2015-06-16 | 1 | -2/+2 |
| | | | | |||||
| * | | | More caveats in README.md | it33 | 2015-06-16 | 1 | -1/+1 |
| |/ / |