summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed team API to properly provide team names for the Find My Team emailhmhealey2015-07-291-4/+17
* Merge pull request #279 from asaadmahmoodspin/masterJoram Wilander2015-07-294-14/+15
|\
| * Minor Ui updates regarding the search and the center channel header on mobile.Asaad Mahmood2015-07-293-12/+12
| * Updating color of hover on LHS HeaderAsaad Mahmood2015-07-291-1/+1
| * Fixing LHS Header cssAsaad Mahmood2015-07-291-1/+2
| * Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-2950-314/+1012
| |\
| * \ Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-2812-14/+105
| |\ \
| * \ \ Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-288-73/+138
| |\ \ \
* | \ \ \ Merge pull request #277 from mattermost/mm-1741Christopher Speller2015-07-292-6/+6
|\ \ \ \ \
| * | | | | updated channel error messages to reflect proper namingJoramWilander2015-07-292-6/+6
| | |_|_|/ | |/| | |
* | | | | Merge pull request #269 from rgarmsen2295/mm-1686Christopher Speller2015-07-293-7/+30
|\ \ \ \ \
| * | | | | Access History and Active Sessions are now lazy-loaded upon opening instead o...Reed Garmsen2015-07-293-7/+30
* | | | | | Merge pull request #259 from nickago/MM-1683Christopher Speller2015-07-291-19/+17
|\ \ \ \ \ \
| * | | | | | Added IE friendly window origin function in place of unwrapped callnickago2015-07-291-1/+1
| * | | | | | Removed timeout originally set on team creationnickago2015-07-291-19/+17
* | | | | | | Merge pull request #256 from nickago/MM-1183Joram Wilander2015-07-292-6/+11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Added a 'set description' link for private channelsnickago2015-07-281-1/+4
| * | | | | | Removed popover on channel name and added ability to set channel descritption...nickago2015-07-271-5/+7
* | | | | | | Merge pull request #275 from asaadmahmoodspin/mm-1762Joram Wilander2015-07-297-46/+100
|\ \ \ \ \ \ \
| * | | | | | | Removing unused id on LHS dropdownAsaad Mahmood2015-07-291-3/+1
| * | | | | | | Improving css for form hints in signup flowAsaad Mahmood2015-07-291-1/+1
| * | | | | | | Fixing error markup in signup flowAsaad Mahmood2015-07-291-2/+2
| * | | | | | | mm-1762 - Search improvements with some other minor Ui changesAsaad Mahmood2015-07-295-44/+100
| * | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1762Asaad Mahmood2015-07-2926-176/+597
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1762Asaad Mahmood2015-07-290-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/mattermost/platform into mm-1762Asaad Mahmood2015-07-285-7/+10
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge pull request #261 from mattermost/it33-freetype-license-additionJoram Wilander2015-07-292-67/+270
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Adding notice for golang-freetype it332015-07-272-67/+270
* | | | | | | | | | Merge pull request #268 from mattermost/mm-1358Joram Wilander2015-07-294-1/+318
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixing spelling and clarifying a few parts of style guide.Christopher Speller2015-07-291-14/+16
| * | | | | | | | | | Minor tweaks to style guideChristopher Speller2015-07-281-2/+6
| * | | | | | | | | | Adding style guideChristopher Speller2015-07-281-0/+161
| * | | | | | | | | | Adding rest of directories to eslint listChristopher Speller2015-07-281-0/+4
| * | | | | | | | | | Adding check target to makefile to run eslint. Adding eslint to package.jsonChristopher Speller2015-07-282-1/+8
| * | | | | | | | | | Configuration for eslintrcChristopher Speller2015-07-281-0/+139
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #252 from rgarmsen2295/ie10-image-regression-fixChristopher Speller2015-07-298-15/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removed usage of window.location.origin throughout the codebaseReed Garmsen2015-07-274-8/+15
| * | | | | | | | | | Fixes issue with images not displaying due to window.origin not being defined...Reed Garmsen2015-07-275-10/+16
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #267 from nickago/MM-1652Christopher Speller2015-07-291-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed typo in delete_post_modalnickago2015-07-281-1/+1
* | | | | | | | | | | Merge pull request #265 from mattermost/mm-1711Joram Wilander2015-07-2914-159/+250
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | added use of strings.Team to replace hardcoded mentions of 'team'JoramWilander2015-07-291-3/+3
| * | | | | | | | | | updated changing email in sign up flow to work properlyJoramWilander2015-07-281-4/+8
| * | | | | | | | | | updated user sign up page and login page with new UI detailsJoramWilander2015-07-283-5/+4
| * | | | | | | | | | updates to sign-up flow, remove company name and marketing checkboxJoramWilander2015-07-287-41/+16
| * | | | | | | | | | Signup Ui changesAsaad Mahmood2015-07-288-114/+227
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #264 from asaadmahmoodspin/mm-1732Corey Hulen2015-07-2811-18/+18
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | MM-1730 - Updating logo in emailsAsaad Mahmood2015-07-2811-9/+9
| * | | | | | | | mm-1732 - Decrease font size for footer in emailsAsaad Mahmood2015-07-289-9/+9
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #270 from mattermost/mm-1763Joram Wilander2015-07-281-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |