Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-29 | 50 | -314/+1012 |
|\ | |||||
| * | 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 | ||||
| | * | | | | | | | Fixed typo in delete_post_modal | nickago | 2015-07-28 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #265 from mattermost/mm-1711 | Joram Wilander | 2015-07-29 | 14 | -159/+250 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | MM-1711 update sign-up and login UI | ||||
| | * | | | | | | | added use of strings.Team to replace hardcoded mentions of 'team' | JoramWilander | 2015-07-29 | 1 | -3/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | updated changing email in sign up flow to work properly | JoramWilander | 2015-07-28 | 1 | -4/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | updated user sign up page and login page with new UI details | JoramWilander | 2015-07-28 | 3 | -5/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | updates to sign-up flow, remove company name and marketing checkbox | JoramWilander | 2015-07-28 | 7 | -41/+16 |
| | | | | | | | | | |||||
| | * | | | | | | | Signup Ui changes | Asaad Mahmood | 2015-07-28 | 8 | -114/+227 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #264 from asaadmahmoodspin/mm-1732 | Corey Hulen | 2015-07-28 | 11 | -18/+18 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | mm-1732 - Decreasing font size for footer in emails | ||||
| | * | | | | | | MM-1730 - Updating logo in emails | Asaad Mahmood | 2015-07-28 | 11 | -9/+9 |
| | | | | | | | | |||||
| | * | | | | | | mm-1732 - Decrease font size for footer in emails | Asaad Mahmood | 2015-07-28 | 9 | -9/+9 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #270 from mattermost/mm-1763 | Joram Wilander | 2015-07-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | MM-1763 update our postgresql index check to work with 9.2.4+ versions of postgresql | ||||
| | * | | | | | update our postgresql index check to work with 9.2+ versions of postgresql | JoramWilander | 2015-07-28 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #255 from hmhealey/mm1682 | Christopher Speller | 2015-07-28 | 4 | -6/+9 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | MM-1682 Allow files without file extensions to be attached to messages | ||||
| | * | | | | Added non-capturing group to regex used for matching local file urls | hmhealey | 2015-07-28 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Display thumbnails for files without file extensions | hmhealey | 2015-07-28 | 2 | -4/+7 |
| | | | | | | |||||
| | * | | | | Allow users to download file attachments with names that don't include a ↵ | hmhealey | 2015-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | file extension | ||||
| | * | | | | Allow files without extensions to be uploaded as attachments to posts | hmhealey | 2015-07-28 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #253 from nickago/MM-1654 | Christopher Speller | 2015-07-28 | 2 | -0/+13 |
| |\ \ \ \ | | | | | | | | | | | | | MM-1654 Anti-clickjacking measures | ||||
| | * | | | | Limited the added headers to only non-api calls | nickago | 2015-07-27 | 1 | -2/+6 |
| | | | | | | |||||
| | * | | | | Centralized header additions and removed duplicate code | nickago | 2015-07-27 | 2 | -32/+2 |
| | | | | | | |||||
| | * | | | | Removed ability to place MM in an iframe | nickago | 2015-07-24 | 2 | -0/+39 |
| | | | | | | |||||
| * | | | | | Merge pull request #260 from rgarmsen2295/mm-1724 | Joram Wilander | 2015-07-28 | 3 | -2/+6 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | MM-1724 Changed title of Active Devices to Active Sessions and added help text explaining Active Sessions | ||||
| | * | | | | Changed title of Active Devices to Active Sessions; added help text ↵ | Reed Garmsen | 2015-07-27 | 3 | -2/+6 |
| | | |_|/ | | |/| | | | | | | | | | | | | explaining Active Sessions | ||||
* | | | | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-28 | 12 | -14/+105 |
|\| | | | | |||||
| * | | | | Merge pull request #262 from mattermost/it33-patch-1 | Joram Wilander | 2015-07-28 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | | | Removed version number from dev build README | ||||
| | * | | | | Removed version number from dev build README | it33 | 2015-07-27 | 1 | -3/+3 |
| | |/ / / | |||||
| * | | | | Merge pull request #239 from nickago/MM-1295 | Christopher Speller | 2015-07-28 | 6 | -0/+91 |
| |\ \ \ \ | | | | | | | | | | | | | MM-1295 Removal from a channel occurs in real time | ||||
| | * | | | | Changed from Jquery style modal modification to using browserStore | nickago | 2015-07-27 | 2 | -9/+26 |
| | | | | | |