Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed the style of key-assignment to allow for more assured variance | nickago | 2015-06-29 | 1 | -2/+1 |
| | |||||
* | Updated file display key to avoid child flattening | nickago | 2015-06-29 | 1 | -1/+2 |
| | |||||
* | Merge pull request #99 from rgarmsen2295/mm-1303 | Joram Wilander | 2015-06-29 | 2 | -1/+10 |
|\ | | | | | MM-1303 | ||||
| * | Changed invite email to reflect the sender's status in the team (e.g. admin ↵ | Reed Garmsen | 2015-06-29 | 2 | -1/+10 |
| | | | | | | | | v.s. plain member) | ||||
* | | Merge pull request #51 from rgarmsen2295/mm-1287 | Corey Hulen | 2015-06-29 | 1 | -1/+2 |
|\ \ | |/ |/| | MM-1287 | ||||
| * | Unescaped escape characters in the subject line of emails so that all ↵ | Reed Garmsen | 2015-06-22 | 1 | -1/+2 |
| | | | | | | | | characters appear properly | ||||
* | | Merge pull request #49 from mattermost/mm-1316 | Joram Wilander | 2015-06-29 | 12 | -90/+210 |
|\ \ | | | | | | | fixes mm-1316 improves channel notifications UI and updates channellist etag | ||||
| * | | rebase touch-ups | JoramWilander | 2015-06-29 | 4 | -3/+4 |
| | | | |||||
| * | | fixed CSS indenting | JoramWilander | 2015-06-29 | 1 | -11/+11 |
| | | | |||||
| * | | make channel notifications modal visible in mobile mode | JoramWilander | 2015-06-29 | 2 | -1/+5 |
| | | | |||||
| * | | update etag version | JoramWilander | 2015-06-29 | 1 | -1/+1 |
| | | | |||||
| * | | updated channel unit test | JoramWilander | 2015-06-29 | 1 | -3/+9 |
| | | | |||||
| * | | fix more indenting | JoramWilander | 2015-06-29 | 1 | -1/+1 |
| | | | |||||
| * | | fix indenting | JoramWilander | 2015-06-29 | 1 | -1/+1 |
| | | | |||||
| * | | fixes mm-1316 improves channel notifications UI and updates channellist etag | JoramWilander | 2015-06-29 | 5 | -76/+185 |
|/ / | |||||
* | | Merge pull request #93 from rgarmsen2295/mm-1317 | Joram Wilander | 2015-06-29 | 1 | -1/+1 |
|\ \ | | | | | | | MM-1317 Fixed typo in team domain look-up page | ||||
| * | | Removed test code | Reed Garmsen | 2015-06-28 | 2 | -5/+5 |
| | | | |||||
| * | | Fixed typo in team domain look-up page | Reed Garmsen | 2015-06-28 | 3 | -6/+6 |
| | | | |||||
* | | | Merge pull request #87 from asaadmahmoodspin/settings-ui | Joram Wilander | 2015-06-29 | 2 | -16/+16 |
|\ \ \ | | | | | | | | | Updating settings UI | ||||
| * | | | Updating settings UI | Asaad Mahmood | 2015-06-28 | 2 | -16/+16 |
| | | | | |||||
* | | | | Merge pull request #79 from asaadmahmoodspin/master | Joram Wilander | 2015-06-29 | 3 | -19/+43 |
|\ \ \ \ | |_|/ / |/| | | | Improving image preview modal and channel info modal | ||||
| * | | | Removing relative from span | Asaad Mahmood | 2015-06-27 | 1 | -2/+1 |
| | | | | |||||
| * | | | mm-1256 - Improving view modal and close modal button | Asaad Mahmood | 2015-06-26 | 3 | -12/+37 |
| | | | | |||||
| * | | | MM-1184 - Updating image preview | Asaad Mahmood | 2015-06-26 | 2 | -7/+7 |
| | | | | |||||
* | | | | Merge pull request #83 from ralder/fix-broken-mailto-user-popover | Corey Hulen | 2015-06-27 | 1 | -6/+4 |
|\ \ \ \ | | | | | | | | | | | gui: Fix broken mailto link in user-popover | ||||
| * | | | | gui: fix broken mailto link in user-popover | ralder | 2015-06-26 | 1 | -6/+4 |
| |/ / / | |||||
* | | | | Merge pull request #82 from ralder/fix-mentions-dropdown | Corey Hulen | 2015-06-27 | 2 | -13/+16 |
|\ \ \ \ | |_|/ / |/| | | | gui: fix mentions dropdown list for pc browsers | ||||
| * | | | gui: fix mentions dropdown | test | 2015-06-26 | 2 | -13/+16 |
| |/ / | |||||
* | | | Merge pull request #66 from adamenger/patch-1 | Corey Hulen | 2015-06-27 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | IAM not AIM | ||||
| * | | | IAM not AIM | adamenger | 2015-06-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #59 from haikoschol/master | Corey Hulen | 2015-06-27 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Fix typo in function name | ||||
| * | | | Fix typo in function name | Haiko Schol | 2015-06-24 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #67 from firstrow/patch-1 | Corey Hulen | 2015-06-25 | 1 | -26/+26 |
|\ \ \ | | | | | | | | | Update README.md - make it little user friendly | ||||
| * | | | Fixed typos | Andrii Bubis | 2015-06-24 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fixed list numbers | Andrii Bubis | 2015-06-24 | 1 | -18/+22 |
| | | | | |||||
| * | | | Update README.md | Andrii Bubis | 2015-06-24 | 1 | -27/+23 |
| |/ / | |||||
* | | | Merge pull request #77 from mattermost/release-0.50 | Corey Hulen | 2015-06-25 | 2 | -2/+10 |
|\ \ \ | | | | | | | | | Release 0.50 | ||||
| * \ \ | Merge pull request #76 from mattermost/update-readme-release | Corey Hulen | 2015-06-25 | 2 | -2/+10 |
| |\ \ \ | | |/ / | |/| | | Update readme release | ||||
| | * | | updating readme | =Corey Hulen | 2015-06-25 | 1 | -11/+2 |
| | | | | |||||
| | * | | updating readme | =Corey Hulen | 2015-06-25 | 2 | -1/+18 |
| |/ / | |||||
* | | | Merge pull request #46 from mattermost/mm-1318 | Joram Wilander | 2015-06-25 | 4 | -32/+49 |
|\ \ \ | | | | | | | | | fixes mm-1318 only allow 5 files to be uploaded at a time | ||||
| * | | | fixes mm-1318 only allow 5 files to be uploaded at a time | JoramWilander | 2015-06-22 | 4 | -32/+49 |
| | | | | |||||
* | | | | Merge pull request #48 from rgarmsen2295/mm-1364 | Corey Hulen | 2015-06-25 | 2 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | MM-1364 | ||||
| * | | | | Fixed bmp image previewing/uploading by adding new go image library | Reed Garmsen | 2015-06-22 | 2 | -0/+5 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #17 from mattermost/master | Reed Garmsen | 2015-06-22 | 9 | -22/+751 |
| |\ \ \ | | | | | | | | | | | to me | ||||
* | \ \ \ | Merge pull request #45 from rgarmsen2295/mm-1309 | Corey Hulen | 2015-06-25 | 1 | -2/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1309 | ||||
| * | | | | | Made it so the team creator can no longer use the same email used at signup ↵ | Reed Garmsen | 2015-06-19 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | to send an invitation to | ||||
| * | | | | | Merge pull request #16 from rgarmsen2295/master | Reed Garmsen | 2015-06-19 | 7 | -74/+177 |
| |\| | | | | | | | | | | | | | | | | Remerging | ||||
| | * | | | | Merge pull request #15 from mattermost/master | Reed Garmsen | 2015-06-19 | 7 | -74/+177 |
| |/| | | | | | | |/ / | | |/| | | to me | ||||
* | | | | | Merge pull request #43 from rgarmsen2295/mm-1202 | Corey Hulen | 2015-06-25 | 2 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1202 |