summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #683 from mattermost/it33-patch-1Harrison Healey2015-09-171-1/+3
|\ | | | | Fixed style guide link, added description
| * Fixed typoit332015-09-171-1/+1
| |
| * Fixed style guide link, added descriptionit332015-09-151-1/+3
| |
* | Merge pull request #700 from mattermost/GIT-698Christopher Speller2015-09-171-0/+4
|\ \ | | | | | | Fixes GIT-698 allow ability to disable team creation for SSO
| * | Fixes GIT-698 allow ability to disable team creation for SSO=Corey Hulen2015-09-161-0/+4
| | |
* | | Merge pull request #702 from mattermost/oauth-switch-fixJoram Wilander2015-09-171-1/+1
|\ \ \ | | | | | | | | Properly check if OAuth providing is enabled on the client.
| * | | Properly check if OAuth providing is enabled on the client.JoramWilander2015-09-171-1/+1
| |/ /
* | | Merge pull request #680 from hmhealey/plt159Joram Wilander2015-09-172-33/+73
|\ \ \ | |/ / |/| | PLT-159 Properly hide unread indicators when there are no unread channels
| * | Cleaned up logic for the unread indicatorsChristopher Speller2015-09-163-108/+100
| | |
| * | Moved unread channel indicators into their own React component and filehmhealey2015-09-162-70/+112
| | |
| * | Properly hide unread channel indicators when there are no unread channelshmhealey2015-09-161-5/+11
|/ /
* | Merge pull request #697 from mattermost/PLT-93Christopher Speller2015-09-1610-18/+19
|\ \ | | | | | | PLT-93 Fixing broken email templates
| * | Fixing broken email templates=Corey Hulen2015-09-161-1/+0
| | |
| * | Fixing broken email templates=Corey Hulen2015-09-161-1/+0
| | |
| * | Fixing broken email templates=Corey Hulen2015-09-161-1/+1
| | |
| * | Fixing broken email templates=Corey Hulen2015-09-1611-19/+22
| | |
* | | Merge pull request #696 from mattermost/PLT-23Christopher Speller2015-09-161-7/+17
|\ \ \ | | | | | | | | PLT-23 error.html pulls files from static
| * | | PLT-23 error.html pulls files from static=Corey Hulen2015-09-161-3/+3
| | | |
| * | | PLT-23 error.html pulls files from static=Corey Hulen2015-09-161-5/+15
| |/ /
* | | Merge pull request #694 from mattermost/GIT-669Christopher Speller2015-09-161-3/+3
|\ \ \ | | | | | | | | Fixing 669 removing -a flag from go cmds
| * | | Fixing 669 removing -a flag from go cmds=Corey Hulen2015-09-161-3/+3
| | | |
* | | | Merge pull request #693 from mattermost/mm-1419Christopher Speller2015-09-1645-199/+2506
|\ \ \ \ | |_|/ / |/| | | Implement OAuth2 service provider functionality.
| * | | Implement OAuth2 service provider functionality.JoramWilander2015-09-1645-199/+2506
| | | |
* | | | Merge pull request #695 from hmhealey/startswithCorey Hulen2015-09-161-2/+2
|\ \ \ \ | |/ / / |/| | | Replaced instances of startsWith with lastIndexOf in TextFormatting
| * | | Replaced instances of startsWith with lastIndexOf in TextFormattinghmhealey2015-09-161-2/+2
| | | |
* | | | Merge pull request #687 from mattermost/PLT-93Christopher Speller2015-09-1687-707/+430
|\ \ \ \ | |_|/ / |/| | | PLT-93 Cleaning up client side configs
| * | | Adding config file timestamp to X-Version header=Corey Hulen2015-09-161-1/+2
| | | |
| * | | Merge branch 'master' into PLT-93=Corey Hulen2015-09-167-21/+66
| |\| |
| * | | Fixing eslint problems=Corey Hulen2015-09-153-7/+0
| | | |
| * | | Finished removing some of the last bits of client side config=Corey Hulen2015-09-154-41/+1
| | | |
| * | | Removing old config stuff=Corey Hulen2015-09-1511-273/+6
| | | |
| * | | PLT-93 cleaing up client side configs=Corey Hulen2015-09-1582-374/+428
| | | |
| * | | removing loggly=Corey Hulen2015-09-153-18/+0
| | | |
* | | | Merge pull request #691 from asaadmahmoodspin/ui-changesCorey Hulen2015-09-169-7/+33
|\ \ \ \ | | | | | | | | | | UI Updates for multiple tickets
| * | | | UI Updates for multiple ticketsAsaad Mahmood2015-09-169-7/+33
| | |/ / | |/| |
* | | | Merge pull request #692 from hmhealey/plt149Corey Hulen2015-09-161-0/+1
|\ \ \ \ | |/ / / |/| | | PLT-149 Removed the file list from (message deleted) placeholder posts
| * | | PLT-149 Removed the file list from (message deleted) placeholder postshmhealey2015-09-161-0/+1
|/ / /
* | | Merge pull request #690 from mattermost/fix-safariHarrison Healey2015-09-162-4/+4
|\ \ \ | | | | | | | | Fixing issues on safari
| * | | Removing js map from react bootstrap to make safari happy.Christopher Speller2015-09-162-4/+4
|/ / / | | | | | | | | | | | | Adding babel runtime to build process because Safari hasen't gotten with the program yet.
* | | Merge pull request #686 from hmhealey/plt172Joram Wilander2015-09-164-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 ↵hmhealey2015-09-152-6/+9
| | | | | | | | | | | | | | | | stops clicks through the scrollbar
| * | | PLT-172 Updated perfect-scrollbar to 0.6.5hmhealey2015-09-154-12/+54
| | | |
* | | | Merge pull request #688 from mattermost/fixing-typoJoram Wilander2015-09-161-4/+4
|\ \ \ \ | |_|/ / |/| | | Fixing typo
| * | | Fixing typo=Corey Hulen2015-09-151-4/+4
|/ / /
* | | Merge pull request #681 from mattermost/PLT-12-logChristopher Speller2015-09-1516-18/+332
|\ \ \ | | | | | | | | PLT-12 Adding server logs viewer to admin console
| * | | Moving style into css=Corey Hulen2015-09-153-14/+14
| | | |
| * | | Fixing eslint issues=Corey Hulen2015-09-141-9/+0
| | | |
| * | | Merge branch 'master' into PLT-12-log=Corey Hulen2015-09-1459-733/+18562
| |\ \ \
| * | | | PLT-12 adding log viewer=Corey Hulen2015-09-1014-15/+338
| | | | |
* | | | | Merge pull request #685 from mattermost/update-style-guideHarrison Healey2015-09-151-8/+11
|\ \ \ \ \ | | | | | | | | | | | | Updating style guide
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 09:04:10 +0000