summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #100 from asaadmahmoodspin/masterCorey Hulen2015-06-291-1/+1
|\
| * MM-1268 - Updating button in email templateAsaad Mahmood2015-06-301-1/+1
| * Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-06-303-2/+12
| |\
| * \ Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-06-2918-126/+247
| |\ \
| * \ \ Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-06-282-2/+2
| |\ \ \
* | \ \ \ Merge pull request #98 from mattermost/mm-1199Corey Hulen2015-06-2911-33/+102
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | update unit tests for default channelsJoramWilander2015-06-293-3/+26
| * | | | add intro text specific to off-topic channelJoramWilander2015-06-292-1/+13
| * | | | new users now join off-topic defaultlyJoramWilander2015-06-294-16/+43
| * | | | move default channel creation to seperate func and add off-topicJoramWilander2015-06-295-22/+29
| | |_|/ | |/| |
* | | | Merge pull request #99 from rgarmsen2295/mm-1303Joram Wilander2015-06-292-1/+10
|\ \ \ \
| * | | | Changed invite email to reflect the sender's status in the team (e.g. admin v...Reed Garmsen2015-06-292-1/+10
| |/ / /
* | | | Merge pull request #51 from rgarmsen2295/mm-1287Corey Hulen2015-06-291-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Unescaped escape characters in the subject line of emails so that all charact...Reed Garmsen2015-06-221-1/+2
* | | | Merge pull request #49 from mattermost/mm-1316Joram Wilander2015-06-2912-90/+210
|\ \ \ \
| * | | | rebase touch-upsJoramWilander2015-06-294-3/+4
| * | | | fixed CSS indentingJoramWilander2015-06-291-11/+11
| * | | | make channel notifications modal visible in mobile modeJoramWilander2015-06-292-1/+5
| * | | | update etag versionJoramWilander2015-06-291-1/+1
| * | | | updated channel unit testJoramWilander2015-06-291-3/+9
| * | | | fix more indentingJoramWilander2015-06-291-1/+1
| * | | | fix indentingJoramWilander2015-06-291-1/+1
| * | | | fixes mm-1316 improves channel notifications UI and updates channellist etagJoramWilander2015-06-295-76/+185
|/ / / /
* | | | Merge pull request #93 from rgarmsen2295/mm-1317Joram Wilander2015-06-291-1/+1
|\ \ \ \
| * | | | Removed test codeReed Garmsen2015-06-282-5/+5
| * | | | Fixed typo in team domain look-up pageReed Garmsen2015-06-283-6/+6
* | | | | Merge pull request #87 from asaadmahmoodspin/settings-uiJoram Wilander2015-06-292-16/+16
|\ \ \ \ \
| * | | | | Updating settings UIAsaad Mahmood2015-06-282-16/+16
| | |_|_|/ | |/| | |
* | | | | Merge pull request #79 from asaadmahmoodspin/masterJoram Wilander2015-06-293-19/+43
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Removing relative from spanAsaad Mahmood2015-06-271-2/+1
| * | | mm-1256 - Improving view modal and close modal buttonAsaad Mahmood2015-06-263-12/+37
| * | | MM-1184 - Updating image previewAsaad Mahmood2015-06-262-7/+7
* | | | Merge pull request #83 from ralder/fix-broken-mailto-user-popoverCorey Hulen2015-06-271-6/+4
|\ \ \ \
| * | | | gui: fix broken mailto link in user-popoverralder2015-06-261-6/+4
| |/ / /
* | | | Merge pull request #82 from ralder/fix-mentions-dropdownCorey Hulen2015-06-272-13/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | gui: fix mentions dropdowntest2015-06-262-13/+16
| |/ /
* | | Merge pull request #66 from adamenger/patch-1Corey Hulen2015-06-271-1/+1
|\ \ \
| * | | IAM not AIMadamenger2015-06-241-1/+1
* | | | Merge pull request #59 from haikoschol/masterCorey Hulen2015-06-271-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix typo in function nameHaiko Schol2015-06-241-1/+1
| |/ /
* | | Merge pull request #67 from firstrow/patch-1Corey Hulen2015-06-251-26/+26
|\ \ \
| * | | Fixed typosAndrii Bubis2015-06-241-2/+2
| * | | Fixed list numbersAndrii Bubis2015-06-241-18/+22
| * | | Update README.mdAndrii Bubis2015-06-241-27/+23
| |/ /
* | | Merge pull request #77 from mattermost/release-0.50Corey Hulen2015-06-252-2/+10
|\ \ \
| * \ \ Merge pull request #76 from mattermost/update-readme-releaseCorey Hulen2015-06-252-2/+10
| |\ \ \ | | |/ / | |/| |
| | * | updating readme=Corey Hulen2015-06-251-11/+2
| | * | updating readme=Corey Hulen2015-06-252-1/+18
| |/ /
* | | Merge pull request #46 from mattermost/mm-1318Joram Wilander2015-06-254-32/+49
|\ \ \
| * | | fixes mm-1318 only allow 5 files to be uploaded at a timeJoramWilander2015-06-224-32/+49