Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cleaned up logic for the unread indicators | Christopher Speller | 2015-09-16 | 3 | -108/+100 |
| | |||||
* | Moved unread channel indicators into their own React component and file | hmhealey | 2015-09-16 | 2 | -70/+112 |
| | |||||
* | Properly hide unread channel indicators when there are no unread channels | hmhealey | 2015-09-16 | 1 | -5/+11 |
| | |||||
* | Merge pull request #697 from mattermost/PLT-93 | Christopher Speller | 2015-09-16 | 10 | -18/+19 |
|\ | | | | | PLT-93 Fixing broken email templates | ||||
| * | Fixing broken email templates | =Corey Hulen | 2015-09-16 | 1 | -1/+0 |
| | | |||||
| * | Fixing broken email templates | =Corey Hulen | 2015-09-16 | 1 | -1/+0 |
| | | |||||
| * | Fixing broken email templates | =Corey Hulen | 2015-09-16 | 1 | -1/+1 |
| | | |||||
| * | Fixing broken email templates | =Corey Hulen | 2015-09-16 | 11 | -19/+22 |
| | | |||||
* | | Merge pull request #696 from mattermost/PLT-23 | Christopher Speller | 2015-09-16 | 1 | -7/+17 |
|\ \ | | | | | | | PLT-23 error.html pulls files from static | ||||
| * | | PLT-23 error.html pulls files from static | =Corey Hulen | 2015-09-16 | 1 | -3/+3 |
| | | | |||||
| * | | PLT-23 error.html pulls files from static | =Corey Hulen | 2015-09-16 | 1 | -5/+15 |
| |/ | |||||
* | | Merge pull request #694 from mattermost/GIT-669 | Christopher Speller | 2015-09-16 | 1 | -3/+3 |
|\ \ | | | | | | | Fixing 669 removing -a flag from go cmds | ||||
| * | | Fixing 669 removing -a flag from go cmds | =Corey Hulen | 2015-09-16 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #693 from mattermost/mm-1419 | Christopher Speller | 2015-09-16 | 45 | -199/+2506 |
|\ \ \ | |_|/ |/| | | Implement OAuth2 service provider functionality. | ||||
| * | | Implement OAuth2 service provider functionality. | JoramWilander | 2015-09-16 | 45 | -199/+2506 |
| | | | |||||
* | | | Merge pull request #695 from hmhealey/startswith | Corey Hulen | 2015-09-16 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Replaced instances of startsWith with lastIndexOf in TextFormatting | ||||
| * | | Replaced instances of startsWith with lastIndexOf in TextFormatting | hmhealey | 2015-09-16 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #687 from mattermost/PLT-93 | Christopher Speller | 2015-09-16 | 87 | -707/+430 |
|\ \ \ | |_|/ |/| | | PLT-93 Cleaning up client side configs | ||||
| * | | Adding config file timestamp to X-Version header | =Corey Hulen | 2015-09-16 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' into PLT-93 | =Corey Hulen | 2015-09-16 | 7 | -21/+66 |
| |\| | |||||
| * | | Fixing eslint problems | =Corey Hulen | 2015-09-15 | 3 | -7/+0 |
| | | | |||||
| * | | Finished removing some of the last bits of client side config | =Corey Hulen | 2015-09-15 | 4 | -41/+1 |
| | | | |||||
| * | | Removing old config stuff | =Corey Hulen | 2015-09-15 | 11 | -273/+6 |
| | | | |||||
| * | | PLT-93 cleaing up client side configs | =Corey Hulen | 2015-09-15 | 82 | -374/+428 |
| | | | |||||
| * | | removing loggly | =Corey Hulen | 2015-09-15 | 3 | -18/+0 |
| | | | |||||
* | | | Merge pull request #691 from asaadmahmoodspin/ui-changes | Corey Hulen | 2015-09-16 | 9 | -7/+33 |
|\ \ \ | | | | | | | | | UI Updates for multiple tickets | ||||
| * | | | UI Updates for multiple tickets | Asaad Mahmood | 2015-09-16 | 9 | -7/+33 |
| | |/ | |/| | |||||
* | | | Merge pull request #692 from hmhealey/plt149 | Corey Hulen | 2015-09-16 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | PLT-149 Removed the file list from (message deleted) placeholder posts | ||||
| * | | PLT-149 Removed the file list from (message deleted) placeholder posts | hmhealey | 2015-09-16 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #690 from mattermost/fix-safari | Harrison Healey | 2015-09-16 | 2 | -4/+4 |
|\ \ | | | | | | | Fixing issues on safari | ||||
| * | | Removing js map from react bootstrap to make safari happy. | Christopher Speller | 2015-09-16 | 2 | -4/+4 |
|/ / | | | | | | | | | Adding babel runtime to build process because Safari hasen't gotten with the program yet. | ||||
* | | Merge pull request #686 from hmhealey/plt172 | Joram Wilander | 2015-09-16 | 4 | -13/+58 |
|\ \ | | | | | | | PLT-172 Fixes TypeErrors and random jumping that occurs when clicking the scroll bar in the sidebar | ||||
| * | | PLT-172 Added a modified version of perfect-scrollbar-0.6.5 which correctly ↵ | hmhealey | 2015-09-15 | 2 | -6/+9 |
| | | | | | | | | | | | | stops clicks through the scrollbar | ||||
| * | | PLT-172 Updated perfect-scrollbar to 0.6.5 | hmhealey | 2015-09-15 | 4 | -12/+54 |
| | | | |||||
* | | | Merge pull request #688 from mattermost/fixing-typo | Joram Wilander | 2015-09-16 | 1 | -4/+4 |
|\ \ \ | |_|/ |/| | | Fixing typo | ||||
| * | | Fixing typo | =Corey Hulen | 2015-09-15 | 1 | -4/+4 |
|/ / | |||||
* | | Merge pull request #681 from mattermost/PLT-12-log | Christopher Speller | 2015-09-15 | 16 | -18/+332 |
|\ \ | | | | | | | PLT-12 Adding server logs viewer to admin console | ||||
| * | | Moving style into css | =Corey Hulen | 2015-09-15 | 3 | -14/+14 |
| | | | |||||
| * | | Fixing eslint issues | =Corey Hulen | 2015-09-14 | 1 | -9/+0 |
| | | | |||||
| * | | Merge branch 'master' into PLT-12-log | =Corey Hulen | 2015-09-14 | 59 | -733/+18562 |
| |\ \ | |||||
| * | | | PLT-12 adding log viewer | =Corey Hulen | 2015-09-10 | 14 | -15/+338 |
| | | | | |||||
* | | | | Merge pull request #685 from mattermost/update-style-guide | Harrison Healey | 2015-09-15 | 1 | -8/+11 |
|\ \ \ \ | | | | | | | | | | | Updating style guide | ||||
| * | | | | Updating style guide | Christopher Speller | 2015-09-15 | 1 | -8/+11 |
| | | | | | |||||
* | | | | | Merge pull request #684 from mattermost/fix-text-overflow | Corey Hulen | 2015-09-15 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixing long channel name overflow by changing text to Edit | ||||
| * | | | | | Fixing long channel name overflow by changing text to Edit | Christopher Speller | 2015-09-15 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #682 from mattermost/nc-patch | Joram Wilander | 2015-09-15 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fixing cutoff team name in new channel modal. | ||||
| * | | | | Fixing cutoff team name in new channel modal | Christopher Speller | 2015-09-15 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #673 from apaatsio/clean-go-deps | Joram Wilander | 2015-09-15 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Clean installed Go dependencies | ||||
| * | | | | Clean installed Go dependencies | Antti Ahti | 2015-09-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | If these are not cleaned it can cause problems when switching between different Go versions. Especially when downgrading Go. | ||||
* | | | | | Merge pull request #676 from hmhealey/mm1900b | Joram Wilander | 2015-09-15 | 9 | -220/+308 |
|\ \ \ \ \ | |_|/ / / |/| | | | | MM-1900 Removed textToJsx |