Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #292 from mattermost/mm-1782 | Joram Wilander | 2015-07-30 | 1 | -3/+16 |
|\ | | | | | MM-1782 makes the LHS dropdown close when clicking on the LHS header | ||||
| * | added .off() for dropdown hide event on LHS header | JoramWilander | 2015-07-30 | 1 | -0/+2 |
| | | |||||
| * | makes the LHS dropdown close when clicking on the LHS header | JoramWilander | 2015-07-30 | 1 | -3/+14 |
| | | |||||
* | | Merge pull request #295 from mattermost/it33-patch-2 | Joram Wilander | 2015-07-30 | 1 | -2/+2 |
|\ \ | | | | | | | Removing unnecessary "the" | ||||
| * | | Removing unnecessary "the" | it33 | 2015-07-30 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #285 from hmhealey/mm1738 | Joram Wilander | 2015-07-30 | 1 | -4/+17 |
|\ \ | | | | | | | MM-1787 Fixed team API to properly provide team names for the Find My Team email | ||||
| * | | Fixed team API to properly provide team names for the Find My Team email | hmhealey | 2015-07-29 | 1 | -4/+17 |
| | | | |||||
* | | | Merge pull request #284 from nickago/MM-1768 | Joram Wilander | 2015-07-30 | 1 | -15/+15 |
|\ \ \ | | | | | | | | | MM-1768 Updated Upload to Select in profile uploader and did cosmetic refactoring | ||||
| * | | | Changed Update to Select, removed illegal spaces, and changed double quotes ↵ | nickago | 2015-07-29 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | to single | ||||
* | | | | Merge pull request #282 from nickago/MM-1642 | Christopher Speller | 2015-07-30 | 1 | -7/+12 |
|\ \ \ \ | | | | | | | | | | | MM-1642 Updated the password error message to not contain extraneous information | ||||
| * | | | | Stripped obfuscating information from password change error and synchronized ↵ | nickago | 2015-07-29 | 1 | -7/+12 |
| |/ / / | | | | | | | | | | | | | error slots so that only one will show at once. | ||||
* | | | | Merge pull request #281 from nickago/MM-1600 | Christopher Speller | 2015-07-30 | 2 | -2/+12 |
|\ \ \ \ | |_|_|/ |/| | | | MM-1600 Improve quality of error returned upon a duplicate username request | ||||
| * | | | Added error safety and a unique message for duplicate emails | nickago | 2015-07-29 | 2 | -2/+8 |
| | | | | |||||
| * | | | Added a unique error message for bad username and simplified error outputed ↵ | nickago | 2015-07-29 | 2 | -2/+6 |
| |/ / | | | | | | | | | | to user | ||||
* | | | Merge pull request #272 from rgarmsen2295/mm-1463 | Christopher Speller | 2015-07-30 | 114 | -6/+85865 |
|\ \ \ | | | | | | | | | MM-1463 Adds back username initials being included in user's default profile picture | ||||
| * | | | Made font type a field in the config file | Reed Garmsen | 2015-07-29 | 4 | -3/+6 |
| | | | | |||||
| * | | | Changed text initial size and positioning to better handle different image ↵ | Reed Garmsen | 2015-07-29 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | sizes and removed dead code | ||||
| * | | | Added godeps and the source for the go freetype library | Reed Garmsen | 2015-07-29 | 111 | -29/+85832 |
| | | | | |||||
| * | | | Added back username initials being included in default profile picture | Reed Garmsen | 2015-07-28 | 1 | -5/+38 |
| | | | | |||||
| * | | | Initial changes to putting initials on default profile pics | Reed Garmsen | 2015-07-28 | 1 | -0/+18 |
| | | | | |||||
* | | | | 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 |