Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #108 from rgarmsen2295/mm-1309 | Christopher Speller | 2015-06-30 | 1 | -1/+1 |
|\ | | | | | MM-1309 Fixed grammmatical issue in error message | ||||
| * | Fixed grammmatical issue in error message | Reed Garmsen | 2015-06-30 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #106 from mattermost/mm-1119 | Joram Wilander | 2015-06-30 | 7 | -11/+74 |
|\ \ | |/ |/| | fixes mm-1119 adds @all and @channel mention capabilites | ||||
| * | @all and @channel now highlight like other mentions | JoramWilander | 2015-06-30 | 2 | -2/+8 |
| | | |||||
| * | add default icon for non-user autocompletes | JoramWilander | 2015-06-30 | 1 | -2/+8 |
| | | |||||
| * | @all and @channel now auto-complete | JoramWilander | 2015-06-29 | 4 | -3/+17 |
| | | |||||
| * | added team-wide and channel-wide mentions | JoramWilander | 2015-06-29 | 1 | -5/+42 |
| | | |||||
* | | Revert "MM-1289 Sorted the channel members popover lexigraphically" | Christopher Speller | 2015-06-30 | 1 | -6/+1 |
| | | |||||
* | | Merge pull request #101 from rgarmsen2295/mm-983 | Christopher Speller | 2015-06-30 | 1 | -1/+1 |
|\ \ | | | | | | | MM-983 Fixed file preview removal in IE10 | ||||
| * | | Changed file preview removal from using dataset which is unsupported in ie10 ↵ | Reed Garmsen | 2015-06-29 | 1 | -1/+1 |
| |/ | | | | | | | to using the getAttribute method which is backwards and forwards compatible | ||||
* | | Merge pull request #91 from nickago/MM-1289 | Christopher Speller | 2015-06-30 | 1 | -1/+6 |
|\ \ | | | | | | | MM-1289 Sorted the channel members popover lexigraphically | ||||
| * | | Added semicolons | nickago | 2015-06-29 | 1 | -2/+2 |
| | | | |||||
| * | | Sorted the channel members popover lexigraphically | nickago | 2015-06-29 | 1 | -1/+6 |
| |/ | |||||
* | | Merge pull request #103 from nickago/MM-1293 | Joram Wilander | 2015-06-30 | 1 | -1/+1 |
|\ \ | | | | | | | MM-1293 Updated file display key to avoid child flattening | ||||
| * | | 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 |
| |/ | |||||
* / | add intro text specific to off-topic channel | JoramWilander | 2015-06-29 | 2 | -1/+13 |
|/ | |||||
* | rebase touch-ups | JoramWilander | 2015-06-29 | 3 | -2/+3 |
| | |||||
* | make channel notifications modal visible in mobile mode | JoramWilander | 2015-06-29 | 1 | -1/+1 |
| | |||||
* | fixes mm-1316 improves channel notifications UI and updates channellist etag | JoramWilander | 2015-06-29 | 2 | -73/+165 |
| | |||||
* | 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 | 1 | -2/+2 |
| | | |||||
| * | Fixed typo in team domain look-up page | Reed Garmsen | 2015-06-28 | 2 | -3/+3 |
| | | |||||
* | | 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 | 1 | -3/+12 |
|\ \ \ | |_|/ |/| | | Improving image preview modal and channel info modal | ||||
| * | | mm-1256 - Improving view modal and close modal button | Asaad Mahmood | 2015-06-26 | 1 | -3/+12 |
| |/ | |||||
* | | 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 |
| |/ | |||||
* / | gui: fix mentions dropdown | test | 2015-06-26 | 1 | -2/+2 |
|/ | |||||
* | 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 #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 | ||||
| * | fixes mm-1315 adds confirmation dialog when closing invite dialog with typed ↵ | JoramWilander | 2015-06-19 | 2 | -38/+113 |
| | | | | | | | | in emails | ||||
* | | Merge pull request #43 from rgarmsen2295/mm-1202 | Corey Hulen | 2015-06-25 | 1 | -2/+2 |
|\ \ | | | | | | | MM-1202 | ||||
| * | | Readded error checking for for first and last names but made the requirement ↵ | Reed Garmsen | 2015-06-19 | 1 | -2/+19 |
| | | | | | | | | | | | | 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 | ||||
| * | fixes br tags causing new lines | JoramWilander | 2015-06-18 | 2 | -7/+2 |
| | | |||||
* | | Merge pull request #41 from asaadmahmoodspin/master | Corey Hulen | 2015-06-25 | 1 | -17/+13 |
|\ \ | | | | | | | 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 | 1 | -11/+11 |
| | | | |||||
| * | | 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 | 5 | -7/+21 |
| |\ \ | | | | | | | | | 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 | 4 | -11/+23 |
| |\ \ \ \ | | | |_|/ | | |/| | | Remerge | ||||
| * | | | | 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 |