Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #289 from mattermost/it33-patch-4 | Corey Hulen | 2015-07-30 | 1 | -1/+1 |
|\ | | | | | MM-1816 Make Off-Topic description more clear | ||||
| * | MM-1816 Make Off-Topic description more clear | it33 | 2015-07-29 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #288 from mattermost/it33-patch-3 | Corey Hulen | 2015-07-30 | 1 | -1/+1 |
|\ \ | | | | | | | Corrected "lower case" to "lowercase" | ||||
| * | | Corrected "lower case" to "lowercase" | it33 | 2015-07-29 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #287 from mattermost/it33-patch-2 | Corey Hulen | 2015-07-30 | 1 | -1/+1 |
|\ \ | | | | | | | Correcting proper use of "set up" vs. "setup" | ||||
| * | | Correcting proper use of "set up" vs. "setup" | it33 | 2015-07-29 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #280 from mattermost/mm-1746 | Corey Hulen | 2015-07-30 | 1 | -1/+1 |
|\ \ | | | | | | | MM-1746 channel handle now populates properly on opening of channel rename modal | ||||
| * | | channel handle now populates properly on opening of channel rename modal | JoramWilander | 2015-07-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #290 from mattermost/mm-1564 | Corey Hulen | 2015-07-30 | 3 | -36/+76 |
|\ \ \ | |_|/ |/| | | Fixes mm-1564 adds release to travis and git | ||||
| * | | fixing travis file | =Corey Hulen | 2015-07-30 | 1 | -1/+1 |
| | | | |||||
| * | | removing flaky unit test | =Corey Hulen | 2015-07-30 | 1 | -6/+6 |
| | | | |||||
| * | | Fixes mm-1564 adds release to travis and git | =Corey Hulen | 2015-07-29 | 2 | -30/+70 |
|/ / | |||||
* | | Merge pull request #279 from asaadmahmoodspin/master | Joram Wilander | 2015-07-29 | 4 | -14/+15 |
|\ \ | | | | | | | Fixing LHS Header css | ||||
| * | | Minor Ui updates regarding the search and the center channel header on mobile. | Asaad Mahmood | 2015-07-29 | 3 | -12/+12 |
| | | | |||||
| * | | Updating color of hover on LHS Header | Asaad Mahmood | 2015-07-29 | 1 | -1/+1 |
| | | | |||||
| * | | Fixing LHS Header css | Asaad Mahmood | 2015-07-29 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-29 | 50 | -314/+1012 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-28 | 12 | -14/+105 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-28 | 8 | -73/+138 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge pull request #277 from mattermost/mm-1741 | Christopher Speller | 2015-07-29 | 2 | -6/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1741 updated channel error messages to reflect proper naming | ||||
| * | | | | | | updated channel error messages to reflect proper naming | JoramWilander | 2015-07-29 | 2 | -6/+6 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #269 from rgarmsen2295/mm-1686 | Christopher Speller | 2015-07-29 | 3 | -7/+30 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1686 Access History and Active Sessions now load upon opening instead of at start | ||||
| * | | | | | | Access History and Active Sessions are now lazy-loaded upon opening instead ↵ | Reed Garmsen | 2015-07-29 | 3 | -7/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | of loaded at start; added loading screens to Access History and Active Sessions | ||||
* | | | | | | | Merge pull request #259 from nickago/MM-1683 | Christopher Speller | 2015-07-29 | 1 | -19/+17 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | MM-1683 Removed a vestigial wait condition from the signup process. | ||||
| * | | | | | | Added IE friendly window origin function in place of unwrapped call | nickago | 2015-07-29 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Removed timeout originally set on team creation | nickago | 2015-07-29 | 1 | -19/+17 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #256 from nickago/MM-1183 | Joram Wilander | 2015-07-29 | 2 | -6/+11 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | MM-1183 Allow channel descriptions on 1-1 channels | ||||
| * | | | | | | Added a 'set description' link for private channels | nickago | 2015-07-28 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Removed popover on channel name and added ability to set channel ↵ | nickago | 2015-07-27 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | descritption for 1-1 channels | ||||
* | | | | | | | Merge pull request #275 from asaadmahmoodspin/mm-1762 | Joram Wilander | 2015-07-29 | 7 | -46/+100 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | MM-1762 - Search improvements with some other minor Ui changes | ||||
| * | | | | | | | Removing unused id on LHS dropdown | Asaad Mahmood | 2015-07-29 | 1 | -3/+1 |
| | | | | | | | | |||||
| * | | | | | | | Improving css for form hints in signup flow | Asaad Mahmood | 2015-07-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fixing error markup in signup flow | Asaad Mahmood | 2015-07-29 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | mm-1762 - Search improvements with some other minor Ui changes | Asaad Mahmood | 2015-07-29 | 5 | -44/+100 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1762 | Asaad Mahmood | 2015-07-29 | 26 | -176/+597 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1762 | Asaad Mahmood | 2015-07-29 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/mattermost/platform into mm-1762 | Asaad Mahmood | 2015-07-28 | 5 | -7/+10 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge pull request #261 from mattermost/it33-freetype-license-addition | Joram Wilander | 2015-07-29 | 2 | -67/+270 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | Adding notice for golang-freetype | ||||
| * | | | | | | | | | Adding notice for golang-freetype | it33 | 2015-07-27 | 2 | -67/+270 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changing from .md to .txt file, and adding formatting changes, because golang-freetype license doesn't format well in .md | ||||
* | | | | | | | | | | Merge pull request #268 from mattermost/mm-1358 | Joram Wilander | 2015-07-29 | 4 | -1/+318 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | MM-1358, MM-1203 Adding preview of style guide and ESLint Javascript + JSX static analyzer | ||||
| * | | | | | | | | | | Fixing spelling and clarifying a few parts of style guide. | Christopher Speller | 2015-07-29 | 1 | -14/+16 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Minor tweaks to style guide | Christopher Speller | 2015-07-28 | 1 | -2/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Adding style guide | Christopher Speller | 2015-07-28 | 1 | -0/+161 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Adding rest of directories to eslint list | Christopher Speller | 2015-07-28 | 1 | -0/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Adding check target to makefile to run eslint. Adding eslint to package.json | Christopher Speller | 2015-07-28 | 2 | -1/+8 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Configuration for eslintrc | Christopher Speller | 2015-07-28 | 1 | -0/+139 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #252 from rgarmsen2295/ie10-image-regression-fix | Christopher Speller | 2015-07-29 | 8 | -15/+28 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with images not displaying in IE10 due to window.location.origin not being defined in IE10 | ||||
| * | | | | | | | | | | Removed usage of window.location.origin throughout the codebase | Reed Garmsen | 2015-07-27 | 4 | -8/+15 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixes issue with images not displaying due to window.origin not being ↵ | Reed Garmsen | 2015-07-27 | 5 | -10/+16 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | defined in IE10 | ||||
* | | | | | | | | | | Merge pull request #267 from nickago/MM-1652 | Christopher Speller | 2015-07-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | MM-1652 Fixed typo in delete post modal |