summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | PLT-500 fixing connection msg issues=Corey Hulen2015-10-064-22/+63
| | |/ / / | |/| | |
* | | | | Merge pull request #961 from mattermost/plt-471Corey Hulen2015-10-074-22/+33
|\ \ \ \ \ | | | | | | | | | | | | PLT-471 Fix user_added websocket event
| * | | | | Fix user_added websocket event and update websocket channel access cache on ↵JoramWilander2015-10-074-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | add/remove member.
* | | | | | Merge pull request #959 from mattermost/build-fixCorey Hulen2015-10-074-29/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | Moving external libraries to the install step and into a seperate bundle.
| * | | | | | Moving external libraries to the install step and into a seperate bundleChristopher Speller2015-10-074-29/+32
| | | | | | |
* | | | | | | Merge pull request #963 from mattermost/plt-538Joram Wilander2015-10-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-538 Add missing -d to webhook doc.
| * | | | | | | Add missing -d to webhook doc.JoramWilander2015-10-071-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #958 from mattermost/plt-450Joram Wilander2015-10-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add space between 'message:' and the actual root message.
| * | | | | | | Add space between 'messsage:' and the actual root message.JoramWilander2015-10-071-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #956 from mishimi/patch-8Harrison Healey2015-10-071-3/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Deleting carriage return
| * | | | | | | Deleting carriage returnmishimi2015-10-071-3/+1
| | | | | | | |
* | | | | | | | Merge pull request #950 from mattermost/PLT-519Harrison Healey2015-10-073-18/+25
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | PLT-519 toggle team creation link based on config setting
| * | | | | | | PLT-519 toggle team creation link based on config setting=Corey Hulen2015-10-063-18/+25
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #953 from asaadmahmoodspin/plt-522Christopher Speller2015-10-075-25/+23
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | PLT-522 - Adding option for mentionHighlightLink for themes
| * | | | | | PLT-522 - Adding option for mentionHighlightLink for themesAsaad Mahmood2015-10-075-25/+23
| |/ / / / /
* | | | | | Merge pull request #955 from mattermost/fix-api-docJoram Wilander2015-10-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix broken link to api doc.
| * | | | | | Fix broken link to api doc.JoramWilander2015-10-071-1/+1
| | | | | | |
* | | | | | | Merge pull request #949 from mattermost/PLT-478Christopher Speller2015-10-071-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-478 partial fix for local storage getting filled up. This will b…
| * | | | | | | PLT-478 partial fix for local storage getting filled up. This will be fixed ↵=Corey Hulen2015-10-061-1/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | for good with multi-login stuff
* | | | | | | Merge pull request #947 from mattermost/PLT-435Christopher Speller2015-10-073-22/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-435 adding ability to demote system admin
| * | | | | | | Adding checkout for system admin role=Corey Hulen2015-10-061-1/+7
| | | | | | | |
| * | | | | | | PLT-435 adding ability to demote system admin=Corey Hulen2015-10-062-21/+24
| |/ / / / / /
* | | | | | | Merge pull request #945 from mattermost/plt-433Christopher Speller2015-10-072-65/+78
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-433 Allow team admin to delete comments.
| * | | | | | | Allow team admin to delete comments.JoramWilander2015-10-062-65/+78
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #943 from mattermost/plt-444Christopher Speller2015-10-072-12/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-444 Parse special characters out of end of mysql search strings.
| * | | | | | | Parse special characters out of search strings and replace with spaces.JoramWilander2015-10-062-12/+33
| | | | | | | |
* | | | | | | | Merge pull request #946 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-079-26/+38
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | PLT-451 - Adding visual effect for logout active sessions button
| * | | | | | | Removing sidebar text hover colorAsaad Mahmood2015-10-064-15/+5
| | | | | | | |
| * | | | | | | Changing link colour opacity LHSAsaad Mahmood2015-10-061-3/+3
| | | | | | | |
| * | | | | | | Updating link color opacity in LHSAsaad Mahmood2015-10-062-11/+11
| | | | | | | |
| * | | | | | | Removing console.logAsaad Mahmood2015-10-061-1/+0
| | | | | | | |
| * | | | | | | PLT-451 - Adding visual effect for logout active sessions buttonAsaad Mahmood2015-10-066-5/+28
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #938 from mattermost/plt-111Corey Hulen2015-10-065-23/+38
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | PLT-111 Combining email verification confirmation screen with login screen.
| * | | | | | Combining email verification confirmation screen with login screen.Christopher Speller2015-10-065-23/+38
| | | | | | |
* | | | | | | Merge pull request #939 from asaadmahmoodspin/plt-424Corey Hulen2015-10-069-307/+318
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Admin console UI Improvements
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/mattermost/platform into plt-424Asaad Mahmood2015-10-061-1/+1
| |\ \ \ \ \ \ \
| * | | | | | | | PLT-432 - Status icon for active LHS item the same as text colorAsaad Mahmood2015-10-061-0/+1
| | | | | | | | |
| * | | | | | | | Admin console UI ImprovementsAsaad Mahmood2015-10-068-307/+317
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #941 from hmhealey/plt515Corey Hulen2015-10-061-11/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-515 Hide Copy Link button when unable to copy the team signup link
| * | | | | | | | Hid Copy Link button when unable to copy the team signup linkhmhealey2015-10-061-11/+18
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #937 from mattermost/plt-230Corey Hulen2015-10-061-2/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | PLT-230 Use HTTP writer to automatically set content-type for file GETs.
| * | | | | | | Use http writer to automatically set content-type for file gets.JoramWilander2015-10-061-2/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #921 from mattermost/plt-16Harrison Healey2015-10-062-0/+95
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | PLT-16 Add basic API doc.
| * | | | | | Rename README.md to Overview.md for api docs.JoramWilander2015-10-061-0/+0
| | | | | | |
| * | | | | | Add basic API doc.JoramWilander2015-10-062-0/+95
| | | | | | |
* | | | | | | Update Production-Ubuntu.mdit332015-10-061-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | 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
| | | | | |