Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #648 from mattermost/PLT-12 | Christopher Speller | 2015-09-14 | 25 | -131/+1625 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-12: Work in progress for Admin Console UI | |||||
| * \ \ \ \ | Merge branch 'master' into PLT-12 | =Corey Hulen | 2015-09-11 | 8 | -33/+35 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN | =Corey Hulen | 2015-09-11 | 7 | -18/+18 | |
| | | | | | | | ||||||
| * | | | | | | Fixing help text based on feedback | =Corey Hulen | 2015-09-11 | 1 | -3/+3 | |
| | |_|_|/ / | |/| | | | | ||||||
| * | | | | | Cleaning up html | =Corey Hulen | 2015-09-10 | 6 | -44/+53 | |
| | | | | | | ||||||
| * | | | | | merging | =Corey Hulen | 2015-09-10 | 52 | -238/+1464 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Fixing unit test | =Corey Hulen | 2015-09-10 | 1 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | re-enabling system_admin | =Corey Hulen | 2015-09-10 | 1 | -5/+0 | |
| | | | | | | | ||||||
| * | | | | | | Adding back admin unit test | =Corey Hulen | 2015-09-10 | 2 | -3/+3 | |
| | | | | | | | ||||||
| * | | | | | | PLT-12 UI framework for admin console | =Corey Hulen | 2015-09-10 | 11 | -368/+924 | |
| | | | | | | | ||||||
| * | | | | | | Adding unit tests for cmd line | =Corey Hulen | 2015-09-04 | 8 | -17/+25 | |
| | | | | | | | ||||||
| * | | | | | | Adding cmd line options | =Corey Hulen | 2015-09-04 | 11 | -96/+472 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' into PLT-12 | =Corey Hulen | 2015-09-03 | 47 | -259/+436 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Adding initial admin console html pages | =Corey Hulen | 2015-09-03 | 3 | -0/+545 | |
| | | | | | | | | ||||||
| * | | | | | | | Adding initial admin console html pages | =Corey Hulen | 2015-09-03 | 8 | -41/+40 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #672 from asaadmahmoodspin/ui-changes | Joram Wilander | 2015-09-14 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | PLT-217 - Improving horizontal scrollbar in LHS menu | |||||
| * | | | | | | | PLT-217 - Improving horizontal scrollbar in LHS menu | Asaad Mahmood | 2015-09-14 | 2 | -1/+6 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #663 from mattermost/it33-patch-4 | Christopher Speller | 2015-09-14 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Link Code Contribution Guidelines from TOC | |||||
| * | | | | | | | Link Code Contribution Guidelines from TOC | it33 | 2015-09-12 | 1 | -0/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #660 from mattermost/it33-patch-3 | Christopher Speller | 2015-09-14 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update CHANGELOG with info on recent commits | |||||
| * | | | | | | | | Update CHANGELOG with info on recent commits | it33 | 2015-09-12 | 1 | -1/+4 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #655 from mattermost/content-type | Christopher Speller | 2015-09-14 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | Set default Content-Type to application/json for all API requests | |||||
| * | | | | | | | | Set default Content-Type to application/json for all API requests | JoramWilander | 2015-09-12 | 1 | -0/+3 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #664 from mattermost/it33-patch-1 | it33 | 2015-09-12 | 1 | -24/+4 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Removing "Alpha" from Docker Hub README | |||||
| * | | | | | | | | Removing "Alpha" from Docker Hub README | it33 | 2015-09-12 | 1 | -24/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #662 from mattermost/it33-patch-1 | it33 | 2015-09-12 | 1 | -0/+35 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Adding "Get Involved" section to README | |||||
| * | | | | | | | Adding "Get Involved" section to README | it33 | 2015-09-12 | 1 | -0/+35 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #658 from mattermost/it33-patch-1 | Joram Wilander | 2015-09-12 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fixed broken links in doc/README.md | |||||
| * | | | | | | Fixed broken links in doc/README.md | it33 | 2015-09-12 | 1 | -2/+2 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #659 from mattermost/it33-patch-1-1 | it33 | 2015-09-12 | 1 | -0/+44 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Create code-contribution.md | |||||
| * | | | | | Create code-contribution.md | it33 | 2015-09-12 | 1 | -0/+44 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #656 from lfbrock/patch-7 | Corey Hulen | 2015-09-11 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Updated developer install instructions | |||||
| * | | | | | Updated developer install instructions | lfbrock | 2015-09-11 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #654 from hmhealey/plt198 | Corey Hulen | 2015-09-11 | 2 | -5/+7 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | PLT-198 Fix unit tests on Go 1.5.1 | |||||
| * | | | | | PLT-198 Added a small delay to one of the web tests to allow the server to ↵ | hmhealey | 2015-09-11 | 1 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | get fully set up | |||||
| * | | | | | PLT-198 Removes invalid emails from tests that require valid email addresses | hmhealey | 2015-09-11 | 1 | -3/+0 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #657 from mattermost/fix-npm-package | Corey Hulen | 2015-09-11 | 1 | -14/+14 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Change versioning to exact versions in package.json | |||||
| * | | | | | Change versioning to exact versions in package.json | Christopher Speller | 2015-09-11 | 1 | -14/+14 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #651 from mattermost/plt-207 | Harrison Healey | 2015-09-11 | 2 | -4/+10 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-207 Fix load more posts bug. | |||||
| * | | | | | Fix load more posts bug. | JoramWilander | 2015-09-11 | 2 | -4/+10 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #653 from lfbrock/patch-6 | Joram Wilander | 2015-09-11 | 1 | -4/+4 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Updated developer install instructions | |||||
| * | | | | Updated developer install instructions | lfbrock | 2015-09-11 | 1 | -4/+4 | |
|/ / / / | ||||||
* | | | | Merge pull request #649 from asaadmahmoodspin/master | Joram Wilander | 2015-09-11 | 3 | -2/+4 | |
|\ \ \ \ | | | | | | | | | | | Updating UI for modals and notification bar | |||||
| * | | | | Updating UI for modals and notification bar | Asaad Mahmood | 2015-09-11 | 3 | -2/+4 | |
|/ / / / | ||||||
* | | | | Merge pull request #645 from mattermost/it33-patch-1 | Joram Wilander | 2015-09-10 | 1 | -9/+3 | |
|\ \ \ \ | |_|_|/ |/| | | | Update README.md | |||||
| * | | | Update README.md | it33 | 2015-09-10 | 1 | -9/+3 | |
| | | | | ||||||
* | | | | Merge pull request #647 from asaadmahmoodspin/ui-changes | Corey Hulen | 2015-09-10 | 2 | -3/+9 | |
|\ \ \ \ | | | | | | | | | | | PM-183 and PM-162 - Updating UI for more modal and unread notification bar | |||||
| * | | | | Removing border from first tr tds in more modal | Asaad Mahmood | 2015-09-10 | 1 | -0/+5 | |
| | | | | | ||||||
| * | | | | PM-183 and PM-162 - Updating UI for more modal and unread notification bar | Asaad Mahmood | 2015-09-10 | 2 | -7/+8 | |
|/ / / / | ||||||
* | | | | Merge release branch 'release-0.7.0' | Christopher Speller | 2015-09-10 | 2 | -1/+2 | |
|\ \ \ \ | |/ / / |/| | | |