summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
* | | Merge pull request #48 from rgarmsen2295/mm-1364Corey Hulen2015-06-252-0/+5
|\ \ \
| * | | Fixed bmp image previewing/uploading by adding new go image libraryReed Garmsen2015-06-222-0/+5
| * | | Merge pull request #17 from mattermost/masterReed Garmsen2015-06-229-22/+751
| |\ \ \
* | \ \ \ Merge pull request #45 from rgarmsen2295/mm-1309Corey Hulen2015-06-251-2/+7
|\ \ \ \ \
| * | | | | Made it so the team creator can no longer use the same email used at signup t...Reed Garmsen2015-06-191-2/+7
| * | | | | Merge pull request #16 from rgarmsen2295/masterReed Garmsen2015-06-197-74/+177
| |\| | | |
| | * | | | Merge pull request #15 from mattermost/masterReed Garmsen2015-06-197-74/+177
| |/| | | | | | | |/ / | | |/| |
* | | | | Merge pull request #43 from rgarmsen2295/mm-1202Corey Hulen2015-06-252-2/+3
|\ \ \ \ \
| * | | | | Readded error checking for for first and last names but made the requirement ...Reed Garmsen2015-06-192-2/+20
| * | | | | Removed checking for first and last name in invite member form, should not be...Reed Garmsen2015-06-191-19/+2
| |/ / / /
| * | | | Merge pull request #14 from mattermost/masterReed Garmsen2015-06-196-51/+146
| |\ \ \ \