summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update CHANGELOG.mdlfbrock2015-10-081-0/+1
* Update to include v1.1.0lfbrock2015-10-081-0/+63
* Merge pull request #970 from mattermost/GIT-957Harrison Healey2015-10-0816-15/+15
|\
| * GIT-957 fixing email templates and logos=Corey Hulen2015-10-0716-15/+15
* | Merge pull request #952 from tomitm/PLT-445Harrison Healey2015-10-083-11/+84
|\ \
| * | Use ReactBootstrap.Modal instead.Tomi M2015-10-074-50/+58
| * | PLT-445 Create About dialogTomi M2015-10-065-11/+76
* | | Merge pull request #948 from rgarmsen2295/plt-167Harrison Healey2015-10-083-9/+41
|\ \ \ | |_|/ |/| |
| * | Now handles commenting on a deleted post gracefully, and checks for any areas...Reed Garmsen2015-10-073-20/+19
| * | Initial changes to how trying to comment on a deleted post is handledReed Garmsen2015-10-062-2/+35
* | | Merge pull request #951 from mattermost/PLT-500Corey Hulen2015-10-074-23/+69
|\ \ \
| * | | Fixing resize=Corey Hulen2015-10-071-15/+16
| * | | Moving to updated=Corey Hulen2015-10-071-1/+1
| * | | Fixing resiz=Corey Hulen2015-10-071-2/+6
| * | | 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
|\ \ \
| * | | Fix user_added websocket event and update websocket channel access cache on a...JoramWilander2015-10-074-22/+33
* | | | Merge pull request #959 from mattermost/build-fixCorey Hulen2015-10-074-29/+32
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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 '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 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=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 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.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 be fixed ...=Corey Hulen2015-10-061-1/+7
| | |_|_|/ | |/| | |
* | | | | Merge pull request #947 from mattermost/PLT-435Christopher Speller2015-10-073-22/+31
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \
| * | | | | Allow team admin to delete comments.JoramWilander2015-10-062-65/+78
| | |/ / / | |/| | |
* | | | | Merge pull request #943 from mattermost/plt-444Christopher Speller2015-10-072-12/+33
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/mattermost/platform into plt-424Asaad Mahmood2015-10-061-1/+1
| |\ \ \ \ \