Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | profile image now generates on each call if S3 is not configured | JoramWilander | 2015-06-19 | 1 | -31/+37 | |
| | | | ||||||
| * | | Merge pull request #39 from mattermost/mm-1315 | Corey Hulen | 2015-06-19 | 2 | -38/+113 | |
| |\ \ | | | | | | | | | HELIUM fixes mm-1315 adds confirmation dialog when closing invite dialog with typed in emails | |||||
| | * | | fixes mm-1315 adds confirmation dialog when closing invite dialog with typed ↵ | JoramWilander | 2015-06-19 | 2 | -38/+113 | |
| | | | | | | | | | | | | | | | | in emails | |||||
| * | | | Merge pull request #36 from mattermost/notification-fix | Corey Hulen | 2015-06-19 | 2 | -1/+3 | |
| |\ \ \ | | | | | | | | | | | HELIUM fix a bug where mentions wouldn't update for words after certain characters | |||||
| | * | | | added slashes to split map | JoramWilander | 2015-06-19 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | improved split function | JoramWilander | 2015-06-19 | 2 | -1/+3 | |
| | | | | | ||||||
| | * | | | remove logging | JoramWilander | 2015-06-19 | 1 | -1/+0 | |
| | | | | | ||||||
| | * | | | fix a bug where mentions wouldn't update for words after a new line | JoramWilander | 2015-06-19 | 1 | -1/+2 | |
| | |/ / | ||||||
| * | | | Merge pull request #42 from mattermost/readme | Christopher Speller | 2015-06-19 | 0 | -0/+0 | |
| |\ \ \ | | | | | | | | | | | Linebreaks HELIUM | |||||
| | * | | | Linebreaks | Christopher Speller | 2015-06-19 | 0 | -0/+0 | |
| |/ / / | ||||||
| * | | | Update README.md | it33 | 2015-06-19 | 0 | -0/+0 | |
| | | | | ||||||
| * | | | Update README.md | it33 | 2015-06-19 | 0 | -0/+0 | |
| | |/ | |/| | ||||||
| * | | 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 | 0 | -0/+0 | |
| | | | | ||||||
| * | | | Merge pull request #37 from mattermost/docker-tweaks | Joram Wilander | 2015-06-19 | 1 | -0/+13 | |
| |\ \ \ | | |/ / | |/| | | Adding linux setup instructions to readme. Adding Dockerrun.aws.json file. HELIUM | |||||
| | * | | Switching port | Christopher Speller | 2015-06-19 | 0 | -0/+0 | |
| | | | | ||||||
| | * | | Adding name and tag to commands | Christopher Speller | 2015-06-19 | 0 | -0/+0 | |
| | | | | ||||||
| | * | | Adding linux setup instructions to readme. Adding Dockerrun.aws.json file | Christopher Speller | 2015-06-19 | 1 | -0/+13 | |
| |/ / | ||||||
| * | | Update README.md | it33 | 2015-06-19 | 0 | -0/+0 | |
| | | | ||||||
| * | | Adding "About Mattermost" to README.md | it33 | 2015-06-19 | 0 | -0/+0 | |
| |/ | ||||||
| * | tweaking readme | =Corey Hulen | 2015-06-18 | 0 | -0/+0 | |
| | | ||||||
| * | Merge pull request #35 from mattermost/readme | Corey Hulen | 2015-06-18 | 1 | -0/+42 | |
| |\ | | | | | | | Updating readme | |||||
| | * | Updating readme | =Corey Hulen | 2015-06-18 | 1 | -0/+42 | |
| |/ | ||||||
| * | 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 #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 #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 | |
| |/ / | ||||||
| * | | 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. | |||||
| * | | 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 #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 | |
| | | | | |