summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #285 from hmhealey/mm1738Joram Wilander2015-07-301-4/+17
|\
| * Fixed team API to properly provide team names for the Find My Team emailhmhealey2015-07-291-4/+17
* | Merge pull request #284 from nickago/MM-1768Joram Wilander2015-07-301-15/+15
|\ \
| * | Changed Update to Select, removed illegal spaces, and changed double quotes t...nickago2015-07-291-15/+15
* | | Merge pull request #282 from nickago/MM-1642Christopher Speller2015-07-301-7/+12
|\ \ \
| * | | Stripped obfuscating information from password change error and synchronized ...nickago2015-07-291-7/+12
| |/ /
* | | Merge pull request #281 from nickago/MM-1600Christopher Speller2015-07-302-2/+12
|\ \ \
| * | | Added error safety and a unique message for duplicate emailsnickago2015-07-292-2/+8
| * | | Added a unique error message for bad username and simplified error outputed t...nickago2015-07-292-2/+6
| |/ /
* | | Merge pull request #272 from rgarmsen2295/mm-1463Christopher Speller2015-07-30114-6/+85865
|\ \ \
| * | | Made font type a field in the config fileReed Garmsen2015-07-294-3/+6
| * | | Changed text initial size and positioning to better handle different image si...Reed Garmsen2015-07-291-3/+5
| * | | Added godeps and the source for the go freetype libraryReed Garmsen2015-07-29111-29/+85832
| * | | Added back username initials being included in default profile pictureReed Garmsen2015-07-281-5/+38
| * | | Initial changes to putting initials on default profile picsReed Garmsen2015-07-281-0/+18
* | | | Merge pull request #289 from mattermost/it33-patch-4Corey Hulen2015-07-301-1/+1
|\ \ \ \
| * | | | MM-1816 Make Off-Topic description more clearit332015-07-291-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #288 from mattermost/it33-patch-3Corey Hulen2015-07-301-1/+1
|\ \ \ \
| * | | | Corrected "lower case" to "lowercase"it332015-07-291-1/+1
| |/ / /
* | | | Merge pull request #287 from mattermost/it33-patch-2Corey Hulen2015-07-301-1/+1
|\ \ \ \
| * | | | Correcting proper use of "set up" vs. "setup"it332015-07-291-1/+1
| |/ / /
* | | | Merge pull request #280 from mattermost/mm-1746Corey Hulen2015-07-301-1/+1
|\ \ \ \
| * | | | channel handle now populates properly on opening of channel rename modalJoramWilander2015-07-291-1/+1
* | | | | Merge pull request #290 from mattermost/mm-1564Corey Hulen2015-07-303-36/+76
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fixing travis file=Corey Hulen2015-07-301-1/+1
| * | | | removing flaky unit test=Corey Hulen2015-07-301-6/+6
| * | | | Fixes mm-1564 adds release to travis and git=Corey Hulen2015-07-292-30/+70
|/ / / /
* | | | 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
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |