Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into PLT-12-log | =Corey Hulen | 2015-09-14 | 59 | -733/+18562 |
|\ | |||||
| * | Merge pull request #678 from mattermost/mm-1589 | Corey Hulen | 2015-09-14 | 27 | -627/+18350 |
| |\ | |||||
| | * | New add channel modal using react-bootstrap. | Christopher Speller | 2015-09-14 | 27 | -627/+18350 |
| * | | Merge pull request #679 from mattermost/fix-file-content-type | Harrison Healey | 2015-09-14 | 2 | -4/+4 |
| |\ \ | |||||
| | * | | Blank Content-Type for file GETs. | JoramWilander | 2015-09-14 | 2 | -4/+4 |
| * | | | Merge pull request #674 from Trozz/PLT-41 | Joram Wilander | 2015-09-14 | 4 | -7/+5 |
| |\ \ \ | |||||
| | * | | | update remaining web files tolowercase | Michael Leer | 2015-09-14 | 2 | -2/+2 |
| | * | | | replace lowerName with name | Michael Leer | 2015-09-14 | 1 | -3/+1 |
| | * | | | PLT-41 | Michael Leer | 2015-09-14 | 1 | -2/+2 |
| | * | | | PLT-41 | Michael Leer | 2015-09-14 | 1 | -1/+1 |
| * | | | | Merge pull request #677 from mattermost/plt-50 | Joram Wilander | 2015-09-14 | 4 | -6/+21 |
| |\ \ \ \ | |||||
| | * | | | | Allowing underscores in channel names. Added conversion of some slack channel... | Christopher Speller | 2015-09-14 | 4 | -6/+21 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge pull request #671 from mattermost/it33-patch-1 | Christopher Speller | 2015-09-14 | 1 | -1/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Updating MaxUsersPerTeam error msg | it33 | 2015-09-13 | 1 | -1/+1 |
| * | | | | Merge pull request #668 from nickago/MM-1958 | Corey Hulen | 2015-09-14 | 1 | -0/+18 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | WIP Added base video player | nickago | 2015-09-12 | 1 | -0/+18 |
| | |/ / | |||||
| * | | | Merge pull request #648 from mattermost/PLT-12 | Christopher Speller | 2015-09-14 | 25 | -131/+1625 |
| |\ \ \ | |||||
| | * \ \ | 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 |
| * | | | | | Merge pull request #672 from asaadmahmoodspin/ui-changes | Joram Wilander | 2015-09-14 | 2 | -1/+6 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | lfbrock | 2015-09-11 | 1 | -2/+2 |
| * | | | | Merge pull request #654 from hmhealey/plt198 | Corey Hulen | 2015-09-11 | 2 | -5/+7 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | PLT-198 Added a small delay to one of the web tests to allow the server to ge... | hmhealey | 2015-09-11 | 1 | -2/+7 |
| | * | | | 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 | Christopher Speller | 2015-09-11 | 1 | -14/+14 |
| | |/ / | |||||
| * | | | Merge pull request #651 from mattermost/plt-207 | Harrison Healey | 2015-09-11 | 2 | -4/+10 |
| |\ \ \ | |||||
| | * | | | 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 | 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 | 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 |
| |\ \ |