Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | | | | Readded error checking for for first and last names but made the requirement ↵ | Reed Garmsen | 2015-06-19 | 2 | -2/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | a config toggle instead of always required | ||||
| * | | | | | Removed checking for first and last name in invite member form, should not ↵ | Reed Garmsen | 2015-06-19 | 1 | -19/+2 |
| |/ / / / | | | | | | | | | | | | | | | | be required even if they are allowed | ||||
| * | | | | Merge pull request #14 from mattermost/master | Reed Garmsen | 2015-06-19 | 6 | -51/+146 |
| |\ \ \ \ | | | | | | | | | | | | | to me | ||||
* | \ \ \ \ | Merge pull request #41 from asaadmahmoodspin/master | Corey Hulen | 2015-06-25 | 2 | -44/+54 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1253 - Fixing new message and date separator corner case | ||||
| * | | | | | | MM-1253 - Fixing new message and date separator corner case | Asaad Mahmood | 2015-06-28 | 2 | -38/+52 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1 from rgarmsen2295/mm-1253 | asaadmahmoodspin | 2015-06-19 | 18 | -62/+489 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | MM-1253 | ||||
| | * | | | | | | Removed extraneous post control from within new message separator | Reed Garmsen | 2015-06-18 | 1 | -3/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #9 from rgarmsen2295/master | Reed Garmsen | 2015-06-18 | 16 | -35/+469 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | to me | ||||
| | * | | | | | | | Removed extraneous code | Reed Garmsen | 2015-06-18 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Changed the new messages separator location in the markup to be at the same ↵ | Reed Garmsen | 2015-06-18 | 2 | -8/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | level as the date seperator | ||||
* | | | | | | | | | Merge pull request #34 from rgarmsen2295/mm-1288 | Corey Hulen | 2015-06-25 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | MM-1288 | ||||
| * | | | | | | | | | Removed extraneous conditional | Reed Garmsen | 2015-06-18 | 1 | -2/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed ability to be able to delete a specific invite field within the invite ↵ | Reed Garmsen | 2015-06-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new member form instead of just removing the bottom one every time | ||||
| * | | | | | | | | | Merge pull request #13 from rgarmsen2295/master | Reed Garmsen | 2015-06-18 | 10 | -19/+49 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | Remerge | ||||
| | * | | | | | | | | Merge pull request #12 from mattermost/master | Reed Garmsen | 2015-06-18 | 2 | -4/+10 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | to me | ||||
| * | | | | | | | | | | Added ability to remove the first entry of a Invite New Members list (or ↵ | Reed Garmsen | 2015-06-17 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear it if there's only one entry | ||||
* | | | | | | | | | | | Merge pull request #32 from rgarmsen2295/mm-1282 | Corey Hulen | 2015-06-25 | 3 | -1/+40 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | MM-1282 | ||||
| * | | | | | | | | | | | Added a util function that checks that local/session storage is enabled. ↵ | Reed Garmsen | 2015-06-18 | 3 | -1/+40 |
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added tests using this function to report an error to the user if it is not enabled | ||||
| * | | | | | | | | | | Merge pull request #11 from mattermost/master | Reed Garmsen | 2015-06-18 | 6 | -11/+28 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | to me | ||||
| * \ \ \ \ \ \ \ \ \ \ | Merge pull request #10 from mattermost/master | Reed Garmsen | 2015-06-18 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | to me |