summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Admin console UI ImprovementsAsaad Mahmood2015-10-068-307/+317
|
* Merge pull request #935 from mattermost/remove-zeroclipboardChristopher Speller2015-10-061-1/+0
|\ | | | | Remove npm reference to unused zeroclipboard.
| * Remove npm reference to unused zeroclipboard.JoramWilander2015-10-061-1/+0
| |
* | Merge pull request #934 from asaadmahmoodspin/ui-improvementsChristopher Speller2015-10-068-21/+51
|\ \ | | | | | | Multiple UI Improvements
| * | Updating form-control focusAsaad Mahmood2015-10-062-2/+6
| | |
| * | Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2015-10-063-5/+5
| |\ \ | | | | | | | | | | | | ui-improvements
| * | | Adding mention highlight setting and improving search highlight tooAsaad Mahmood2015-10-064-9/+32
| | | |
| * | | Multiple UI ImprovementsAsaad Mahmood2015-10-065-12/+15
| | |/ | |/|
* | | Merge pull request #936 from mattermost/signup-fixJoram Wilander2015-10-061-13/+14
|\ \ \ | |_|/ |/| | Fixing broken signup page
| * | Fixing broken signup pageChristopher Speller2015-10-061-13/+14
| |/
* | Merge branch 'sexybern-patch-1'Christopher Speller2015-10-061-2/+2
|\ \
| * \ Merge branch 'patch-1' of https://github.com/sexybern/platform into ↵Christopher Speller2015-10-061-2/+2
| |\ \ | | |/ | |/| | | | sexybern-patch-1
| | * Update prod-ubuntu.mdsexybern2015-10-051-2/+2
| | |
* | | Merge pull request #929 from hmhealey/plt439Joram Wilander2015-10-062-3/+3
|\ \ \ | |/ / |/| | PLT-439 Fixed Get Public Link button
| * | Fixed Get Public Link buttonhmhealey2015-10-052-3/+3
| | |
* | | Merge pull request #933 from mattermost/readme-fixChristopher Speller2015-10-051-5/+5
|\ \ \ | | | | | | | | Fixing broken links in README.md
| * | | Fixing broken links in README.mdChristopher Speller2015-10-051-5/+5
|/ / /
* | | Merge pull request #927 from mattermost/lfbrock-patch-1Christopher Speller2015-10-051-0/+2
|\ \ \ | |/ / |/| | Added when to use https vs http to GitLab SSO instructions
| * | Added when to use https vs http to GitLab SSO instructionslfbrock2015-10-051-0/+2
| | |
* | | Merge pull request #925 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-10-058-24/+20
|\ \ \ | | | | | | | | Multiple UI Improvements
| * | | Multiple UI ImprovementsAsaad Mahmood2015-10-058-24/+20
| | | |
* | | | Merge pull request #922 from mattermost/plt-360Harrison Healey2015-10-0533-308/+350
|\ \ \ \ | |_|/ / |/| | | PLT-360 Upgrade and changes to ESLint
| * | | Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. ↵Christopher Speller2015-10-0533-308/+350
| | | | | | | | | | | | | | | | Adding new ESLint rules. Fixing new ESLint errors.
* | | | Merge branch 'release-1.0.0'Christopher Speller2015-10-051-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Updating Dockerfile for release v1.0.0Christopher Speller2015-10-021-1/+1
| | | |
* | | | Merge pull request #923 from mattermost/fix-load-scrollCorey Hulen2015-10-051-1/+1
|\ \ \ \ | | | | | | | | | | Fix missed binding for youtube data callback.
| * | | | Fix missed binding for youtube data callback.JoramWilander2015-10-051-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #917 from mattermost/plt-420Corey Hulen2015-10-0518-28/+59
|\ \ \ \ | | | | | | | | | | Adding doc system to build. Updated docs, fixed links.
| * | | | Adding doc system to build. Updated docs, fixed links.Christopher Speller2015-10-0518-28/+59
| | | | |
* | | | | Merge pull request #914 from mattermost/plt-297Joram Wilander2015-10-0512-10/+158
|\ \ \ \ \ | | | | | | | | | | | | PLT-297 Add ability to override username and icon for posts from incoming webhooks.
| * | | | | Update help text to mention the BOT tag for webhook posts.JoramWilander2015-10-051-1/+1
| | | | | |
| * | | | | Add config options for overriding username and icon, and add BOT indicator ↵JoramWilander2015-10-0511-17/+119
| | | | | | | | | | | | | | | | | | | | | | | | next to webhook posts.
| * | | | | Add ability to override username and icon for posts from incoming webhooks.JoramWilander2015-10-025-8/+54
| | | | | |
* | | | | | Adding note on command line toolit332015-10-051-1/+3
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #915 from mattermost/plt-300Christopher Speller2015-10-055-28/+63
|\ \ \ \ \ | | | | | | | | | | | | PLT-300 Update allow/deny oauth page UI, and add ouath as reserved word.
| * | | | | Update allow/deny oauth page UI, and add ouath as reserved word.JoramWilander2015-10-025-28/+63
| | | | | |
* | | | | | Merge pull request #903 from mattermost/PLT-44Christopher Speller2015-10-059-25/+127
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-44 allow team switching without the need to login
| * | | | | | Fixing redirect issue=Corey Hulen2015-10-021-1/+1
| | | | | | |
| * | | | | | Fixing issues=Corey Hulen2015-10-021-1/+1
| | | | | | |
| * | | | | | Fixing issues=Corey Hulen2015-10-021-2/+2
| | | | | | |
| * | | | | | Fixing issue with being logged into other team=Corey Hulen2015-10-011-9/+17
| | | | | | |
| * | | | | | PLT-44 allow team switching without the need to login=Corey Hulen2015-10-019-15/+109
| | | | | | |
* | | | | | | Merge pull request #887 from asaadmahmoodspin/plt-375Joram Wilander2015-10-0517-89/+69
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | plt-375 - Making modals compatible with themes
| * | | | | | Increasing spacing for bottom unread notificationAsaad Mahmood2015-10-051-1/+1
| | | | | | |
| * | | | | | Updating theme colours for popovers, drop downs etcAsaad Mahmood2015-10-056-52/+33
| | | | | | |
| * | | | | | Updating search coloursAsaad Mahmood2015-10-051-1/+2
| | | | | | |
| * | | | | | Updating jpg to png for theme namesAsaad Mahmood2015-10-051-1/+1
| | | | | | |
| * | | | | | Merge branch 'master' of https://github.com/mattermost/platform into plt-375Asaad Mahmood2015-10-052-12/+38
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Changing jpeg images back to pngAsaad Mahmood2015-10-028-0/+0
| | | | | | |
| * | | | | | Merge branch 'master' of https://github.com/mattermost/platform into plt-375Asaad Mahmood2015-10-0231-281/+572
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: web/react/components/user_settings/user_settings_appearance.jsx