Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Readded error checking for for first and last names but made the requirement ↵ | Reed Garmsen | 2015-06-19 | 2 | -2/+20 |
| | | | | a config toggle instead of always required | ||||
* | Removed checking for first and last name in invite member form, should not ↵ | Reed Garmsen | 2015-06-19 | 1 | -19/+2 |
| | | | | be required even if they are allowed | ||||
* | Merge pull request #14 from mattermost/master | Reed Garmsen | 2015-06-19 | 6 | -51/+146 |
|\ | | | | | to me | ||||
| * | Update README.md | it33 | 2015-06-19 | 1 | -1/+1 |
| | | |||||
| * | Update README.md | it33 | 2015-06-19 | 1 | -8/+1 |
| | | |||||
| * | Merge pull request #38 from mattermost/feedback-email-fix | Joram Wilander | 2015-06-19 | 1 | -0/+4 |
| |\ | | | | | | | Defaulting to domain of localhost when no domain is given HELIUM | ||||
| | * | Defaulting to domain of localhost when no domain is given | Christopher Speller | 2015-06-19 | 1 | -0/+4 |
| | | | |||||
| * | | Update README.md | it33 | 2015-06-19 | 1 | -6/+7 |
| | | | |||||
| * | | Merge pull request #37 from mattermost/docker-tweaks | Joram Wilander | 2015-06-19 | 2 | -3/+43 |
| |\ \ | | |/ | |/| | Adding linux setup instructions to readme. Adding Dockerrun.aws.json file. HELIUM | ||||
| | * | Switching port | Christopher Speller | 2015-06-19 | 1 | -4/+4 |
| | | | |||||
| | * | Adding name and tag to commands | Christopher Speller | 2015-06-19 | 1 | -2/+2 |
| | | | |||||
| | * | Adding linux setup instructions to readme. Adding Dockerrun.aws.json file | Christopher Speller | 2015-06-19 | 2 | -3/+43 |
| |/ | |||||
| * | Update README.md | it33 | 2015-06-19 | 1 | -1/+1 |
| | | |||||
| * | Adding "About Mattermost" to README.md | it33 | 2015-06-19 | 1 | -2/+8 |
| | | |||||
| * | tweaking readme | =Corey Hulen | 2015-06-18 | 1 | -32/+33 |
| | | |||||
| * | Merge pull request #35 from mattermost/readme | Corey Hulen | 2015-06-18 | 2 | -42/+97 |
| |\ | | | | | | | Updating readme | ||||
| | * | Updating readme | =Corey Hulen | 2015-06-18 | 2 | -42/+97 |
| |/ | |||||
| * | Merge pull request #33 from mattermost/br-fix | Corey Hulen | 2015-06-18 | 2 | -7/+2 |
| |\ | | | | | | | HELIUM fixes br tags causing new lines | ||||
| | * | fixes br tags causing new lines | JoramWilander | 2015-06-18 | 2 | -7/+2 |
| |/ | |||||
* | | Merge pull request #12 from mattermost/master | Reed Garmsen | 2015-06-18 | 2 | -4/+10 |
|\| | | | | | to me | ||||
| * | Merge pull request #31 from mattermost/feedback-email-auto | Corey Hulen | 2015-06-18 | 2 | -4/+10 |
| |\ | | | | | | | HELIUM If feedback email is not specified then autodetect domain and use feedback@domain | ||||
| | * | If feedback email is not specified then autodetect domain and use ↵ | Christopher Speller | 2015-06-18 | 2 | -4/+10 |
| | | | | | | | | | | | | feedback@domain | ||||
* | | | Merge pull request #11 from mattermost/master | Reed Garmsen | 2015-06-18 | 6 | -11/+28 |
|\| | | | | | | | | to me | ||||
| * | | Merge pull request #30 from mattermost/dockerhost | Joram Wilander | 2015-06-18 | 5 | -4/+19 |
| |\ \ | | | | | | | | | fix for dockerhost HELIUM | ||||
| | * | | fix for dockerhost HELIUM | =Corey Hulen | 2015-06-18 | 5 | -4/+19 |
| | | | | |||||
| * | | | Merge pull request #29 from mattermost/mm-1297 | Corey Hulen | 2015-06-18 | 1 | -7/+9 |
| |\ \ \ | | |/ / | |/| | | FOR HELIUM RELEASE fixes mm-1297 can now scroll through more than 5 images | ||||
| | * | | fixes mm-1297 can now scroll through more than 5 images | JoramWilander | 2015-06-18 | 1 | -7/+9 |
| |/ / | |||||
* | | | Merge pull request #10 from mattermost/master | Reed Garmsen | 2015-06-18 | 1 | -2/+2 |
|\| | | | | | | | | to me | ||||
| * | | Changed "Theme Color Option" to "Theme Color" | it33 | 2015-06-18 | 1 | -2/+2 |
| | | | |||||
| * | | Update "Theme" to "Theme Color Options" | it33 | 2015-06-18 | 1 | -2/+2 |
| | | | | | | | | | Needed to make marketing screen look nice. | ||||
* | | | Merge pull request #8 from mattermost/master | Reed Garmsen | 2015-06-18 | 1 | -2/+9 |
|\| | | | | | | | | to me | ||||
| * | | Update NOTICE.txt | it33 | 2015-06-18 | 1 | -0/+2 |
| | | | |||||
| * | | Update NOTICE.txt | it33 | 2015-06-18 | 1 | -1/+1 |
| | | | |||||
| * | | Update NOTICE.txt | it33 | 2015-06-18 | 1 | -1/+6 |
| |/ | |||||
* | | 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 |