summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * Merge pull request #678 from mattermost/mm-1589Corey Hulen2015-09-1427-627/+18350
| |\ | | | | | | PLT-171 MM-1589 New add channel modal using react-bootstrap.
| | * New add channel modal using react-bootstrap.Christopher Speller2015-09-1427-627/+18350
| | |
| * | Merge pull request #679 from mattermost/fix-file-content-typeHarrison Healey2015-09-142-4/+4
| |\ \ | | | | | | | | Blank Content-Type for file GETs.
| | * | Blank Content-Type for file GETs.JoramWilander2015-09-142-4/+4
| | | |
| * | | Merge pull request #674 from Trozz/PLT-41Joram Wilander2015-09-144-7/+5
| |\ \ \ | | | | | | | | | | PLT-41 Automatically convert uppercase letters to lowercase in username input box.
| | * | | update remaining web files tolowercaseMichael Leer2015-09-142-2/+2
| | | | |
| | * | | replace lowerName with nameMichael Leer2015-09-141-3/+1
| | | | |
| | * | | PLT-41Michael Leer2015-09-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Removed lowercase from the error wording. Removed additional toLowerCase within validator.
| | * | | PLT-41Michael Leer2015-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically convert uppercase letters to lowercase in username input box. Validator not changed.
| * | | | Merge pull request #677 from mattermost/plt-50Joram Wilander2015-09-144-6/+21
| |\ \ \ \ | | | | | | | | | | | | PLT-50 Allowing channel names with underscores. Allow import of more slack channel names.
| | * | | | Allowing underscores in channel names. Added conversion of some slack ↵Christopher Speller2015-09-144-6/+21
| | | |_|/ | | |/| | | | | | | | | | | | channel names into valid mattermost names.
| * | | | Merge pull request #671 from mattermost/it33-patch-1Christopher Speller2015-09-141-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | | Updating MaxUsersPerTeam error msg
| | * | | Updating MaxUsersPerTeam error msgit332015-09-131-1/+1
| | | | | | | | | | | | | | | This message is displayed to a person attempting to sign-up for a new team, and "You've reached the limit" phrasing is confusing because it refers to the team, not the person signing up for the team.
| * | | | Merge pull request #668 from nickago/MM-1958Corey Hulen2015-09-141-0/+18
| |\ \ \ \ | | |_|_|/ | |/| | | MM-1958 please read comment, base video player
| | * | | WIP Added base video playernickago2015-09-121-0/+18
| | |/ /
| * | | Merge pull request #648 from mattermost/PLT-12Christopher Speller2015-09-1425-131/+1625
| |\ \ \ | | | | | | | | | | PLT-12: Work in progress for Admin Console UI
| | * \ \ Merge branch 'master' into PLT-12=Corey Hulen2015-09-118-33/+35
| | |\ \ \
| | * | | | Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN=Corey Hulen2015-09-117-18/+18
| | | | | |
| | * | | | Fixing help text based on feedback=Corey Hulen2015-09-111-3/+3
| | | | | |
| * | | | | Merge pull request #672 from asaadmahmoodspin/ui-changesJoram Wilander2015-09-142-1/+6
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | PLT-217 - Improving horizontal scrollbar in LHS menu
| | * | | | PLT-217 - Improving horizontal scrollbar in LHS menuAsaad Mahmood2015-09-142-1/+6
| | | |_|/ | | |/| |
| * | | | Merge pull request #663 from mattermost/it33-patch-4Christopher Speller2015-09-141-0/+1
| |\ \ \ \ | | | | | | | | | | | | Link Code Contribution Guidelines from TOC
| | * | | | Link Code Contribution Guidelines from TOCit332015-09-121-0/+1
| | | | | |
| * | | | | Merge pull request #660 from mattermost/it33-patch-3Christopher Speller2015-09-141-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | Update CHANGELOG with info on recent commits
| | * | | | | Update CHANGELOG with info on recent commitsit332015-09-121-1/+4
| | | | | | |
| * | | | | | Merge pull request #655 from mattermost/content-typeChristopher Speller2015-09-141-0/+3
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | Set default Content-Type to application/json for all API requests
| | * | | | | Set default Content-Type to application/json for all API requestsJoramWilander2015-09-121-0/+3
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #664 from mattermost/it33-patch-1it332015-09-121-24/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | Removing "Alpha" from Docker Hub README
| | * | | | | Removing "Alpha" from Docker Hub READMEit332015-09-121-24/+4
| |/ / / / /
| * | | | | Merge pull request #662 from mattermost/it33-patch-1it332015-09-121-0/+35
| |\ \ \ \ \ | | |/ / / / | |/| | | | Adding "Get Involved" section to README
| | * | | | Adding "Get Involved" section to READMEit332015-09-121-0/+35
| |/ / / /
| * | | | Merge pull request #658 from mattermost/it33-patch-1Joram Wilander2015-09-121-2/+2
| |\ \ \ \ | | |/ / / | |/| | | Fixed broken links in doc/README.md
| | * | | Fixed broken links in doc/README.mdit332015-09-121-2/+2
| | | | |
| * | | | Merge pull request #659 from mattermost/it33-patch-1-1it332015-09-121-0/+44
| |\ \ \ \ | | |/ / / | |/| | | Create code-contribution.md
| | * | | Create code-contribution.mdit332015-09-121-0/+44
| |/ / /
| * | | Merge pull request #656 from lfbrock/patch-7Corey Hulen2015-09-111-2/+2
| |\ \ \ | | | | | | | | | | Updated developer install instructions
| | * | | Updated developer install instructionslfbrock2015-09-111-2/+2
| | | | |
| * | | | Merge pull request #654 from hmhealey/plt198Corey Hulen2015-09-112-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 ↵hmhealey2015-09-111-2/+7
| | | | | | | | | | | | | | | | | | | | get fully set up
| | * | | PLT-198 Removes invalid emails from tests that require valid email addresseshmhealey2015-09-111-3/+0
| | | | |
| * | | | Merge pull request #657 from mattermost/fix-npm-packageCorey Hulen2015-09-111-14/+14
| |\ \ \ \ | | |_|/ / | |/| | | Change versioning to exact versions in package.json
| | * | | Change versioning to exact versions in package.jsonChristopher Speller2015-09-111-14/+14
| | |/ /
| * | | Merge pull request #651 from mattermost/plt-207Harrison Healey2015-09-112-4/+10
| |\ \ \ | | | | | | | | | | PLT-207 Fix load more posts bug.
| | * | | Fix load more posts bug.JoramWilander2015-09-112-4/+10
| | |/ /
| * | | Merge pull request #653 from lfbrock/patch-6Joram Wilander2015-09-111-4/+4
| |\ \ \ | | |/ / | |/| | Updated developer install instructions
| | * | Updated developer install instructionslfbrock2015-09-111-4/+4
| |/ /
| * | Merge pull request #649 from asaadmahmoodspin/masterJoram Wilander2015-09-113-2/+4
| |\ \ | | | | | | | | Updating UI for modals and notification bar