Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16 from rgarmsen2295/master | Reed Garmsen | 2015-06-19 | 7 | -74/+177 |
|\ | |||||
| * | Merge pull request #15 from mattermost/master | Reed Garmsen | 2015-06-19 | 7 | -74/+177 |
|/| | |||||
| * | Merge pull request #40 from mattermost/image-fix | Corey Hulen | 2015-06-19 | 2 | -35/+48 |
| |\ | |||||
| | * | update unit tests for new createProfileImage func | JoramWilander | 2015-06-19 | 1 | -4/+11 |
| | * | 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 |
| |\ \ | |||||
| | * | | fixes mm-1315 adds confirmation dialog when closing invite dialog with typed ... | JoramWilander | 2015-06-19 | 2 | -38/+113 |
| * | | | Merge pull request #36 from mattermost/notification-fix | Corey Hulen | 2015-06-19 | 2 | -1/+3 |
| |\ \ \ | |||||
| | * | | | 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 | 1 | -0/+13 |
| |\ \ \ | |||||
| | * | | | Linebreaks | Christopher Speller | 2015-06-19 | 1 | -0/+13 |
| |/ / / | |||||
* | | | | Merge pull request #14 from mattermost/master | Reed Garmsen | 2015-06-19 | 6 | -51/+146 |
|\| | | | |||||
| * | | | 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 | 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 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | 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 | =Corey Hulen | 2015-06-18 | 2 | -42/+97 |
| |/ | |||||
| * | Merge pull request #33 from mattermost/br-fix | Corey Hulen | 2015-06-18 | 2 | -7/+2 |
| |\ | |||||
| | * | 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 |
|\| | |||||
| * | Merge pull request #31 from mattermost/feedback-email-auto | Corey Hulen | 2015-06-18 | 2 | -4/+10 |
| |\ | |||||
| | * | If feedback email is not specified then autodetect domain and use feedback@do... | Christopher Speller | 2015-06-18 | 2 | -4/+10 |
* | | | Merge pull request #11 from mattermost/master | Reed Garmsen | 2015-06-18 | 6 | -11/+28 |
|\| | | |||||
| * | | Merge pull request #30 from mattermost/dockerhost | Joram Wilander | 2015-06-18 | 5 | -4/+19 |
| |\ \ | |||||
| | * | | 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 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | 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 |
|\| | | |||||
| * | | 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 |
* | | | Merge pull request #8 from mattermost/master | Reed Garmsen | 2015-06-18 | 1 | -2/+9 |
|\| | | |||||
| * | | 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 |
|\| | |||||
| * | Merge pull request #25 from rgarmsen2295/mm-1064 | Corey Hulen | 2015-06-17 | 2 | -4/+4 |
| |\ | |||||
| | * | Merge pull request #6 from rgarmsen2295/master | Reed Garmsen | 2015-06-17 | 9 | -54/+167 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #5 from mattermost/master | Reed Garmsen | 2015-06-17 | 9 | -55/+168 |
|\| | |