Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #970 from mattermost/GIT-957 | Harrison Healey | 2015-10-08 | 16 | -15/+15 |
|\ | | | | | GIT-957 fixing email templates and logos | ||||
| * | GIT-957 fixing email templates and logos | =Corey Hulen | 2015-10-07 | 16 | -15/+15 |
| | | |||||
* | | Merge pull request #952 from tomitm/PLT-445 | Harrison Healey | 2015-10-08 | 3 | -11/+84 |
|\ \ | | | | | | | PLT-445 Create About dialog | ||||
| * | | Use ReactBootstrap.Modal instead. | Tomi M | 2015-10-07 | 4 | -50/+58 |
| | | | |||||
| * | | PLT-445 Create About dialog | Tomi M | 2015-10-06 | 5 | -11/+76 |
| | | | |||||
* | | | Merge pull request #948 from rgarmsen2295/plt-167 | Harrison Healey | 2015-10-08 | 3 | -9/+41 |
|\ \ \ | |_|/ |/| | | PLT-167 Fixes issue with trying to comment on a deleted post | ||||
| * | | Now handles commenting on a deleted post gracefully, and checks for any ↵ | Reed Garmsen | 2015-10-07 | 3 | -20/+19 |
| | | | | | | | | | | | | areas where data may no longer exist once a post has been deleted | ||||
| * | | Initial changes to how trying to comment on a deleted post is handled | Reed Garmsen | 2015-10-06 | 2 | -2/+35 |
| | | | |||||
* | | | Merge pull request #951 from mattermost/PLT-500 | Corey Hulen | 2015-10-07 | 4 | -23/+69 |
|\ \ \ | | | | | | | | | PLT-500 fixing connection msg issues | ||||
| * | | | Fixing resize | =Corey Hulen | 2015-10-07 | 1 | -15/+16 |
| | | | | |||||
| * | | | Moving to updated | =Corey Hulen | 2015-10-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixing resiz | =Corey Hulen | 2015-10-07 | 1 | -2/+6 |
| | | | | |||||
| * | | | PLT-500 fixing connection msg issues | =Corey Hulen | 2015-10-06 | 4 | -22/+63 |
| | |/ | |/| | |||||
* | | | Merge pull request #961 from mattermost/plt-471 | Corey Hulen | 2015-10-07 | 4 | -22/+33 |
|\ \ \ | | | | | | | | | PLT-471 Fix user_added websocket event | ||||
| * | | | Fix user_added websocket event and update websocket channel access cache on ↵ | JoramWilander | 2015-10-07 | 4 | -22/+33 |
| | | | | | | | | | | | | | | | | add/remove member. | ||||
* | | | | Merge pull request #959 from mattermost/build-fix | Corey Hulen | 2015-10-07 | 4 | -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 bundle | Christopher Speller | 2015-10-07 | 4 | -29/+32 |
| | | | | | |||||
* | | | | | Merge pull request #963 from mattermost/plt-538 | Joram Wilander | 2015-10-07 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-538 Add missing -d to webhook doc. | ||||
| * | | | | | Add missing -d to webhook doc. | JoramWilander | 2015-10-07 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #958 from mattermost/plt-450 | Joram Wilander | 2015-10-07 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Add space between 'message:' and the actual root message. | ||||
| * | | | | | Add space between 'messsage:' and the actual root message. | JoramWilander | 2015-10-07 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #956 from mishimi/patch-8 | Harrison Healey | 2015-10-07 | 1 | -3/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Deleting carriage return | ||||
| * | | | | | Deleting carriage return | mishimi | 2015-10-07 | 1 | -3/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #950 from mattermost/PLT-519 | Harrison Healey | 2015-10-07 | 3 | -18/+25 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | PLT-519 toggle team creation link based on config setting | ||||
| * | | | | | PLT-519 toggle team creation link based on config setting | =Corey Hulen | 2015-10-06 | 3 | -18/+25 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #953 from asaadmahmoodspin/plt-522 | Christopher Speller | 2015-10-07 | 5 | -25/+23 |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-522 - Adding option for mentionHighlightLink for themes | ||||
| * | | | | PLT-522 - Adding option for mentionHighlightLink for themes | Asaad Mahmood | 2015-10-07 | 5 | -25/+23 |
| |/ / / | |||||
* | | | | Merge pull request #955 from mattermost/fix-api-doc | Joram Wilander | 2015-10-07 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix broken link to api doc. | ||||
| * | | | | Fix broken link to api doc. | JoramWilander | 2015-10-07 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #949 from mattermost/PLT-478 | Christopher Speller | 2015-10-07 | 1 | -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 Hulen | 2015-10-06 | 1 | -1/+7 |
| | |_|_|/ | |/| | | | | | | | | | | | | | for good with multi-login stuff | ||||
* | | | | | Merge pull request #947 from mattermost/PLT-435 | Christopher Speller | 2015-10-07 | 3 | -22/+31 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-435 adding ability to demote system admin | ||||
| * | | | | | Adding checkout for system admin role | =Corey Hulen | 2015-10-06 | 1 | -1/+7 |
| | | | | | | |||||
| * | | | | | PLT-435 adding ability to demote system admin | =Corey Hulen | 2015-10-06 | 2 | -21/+24 |
| |/ / / / | |||||
* | | | | | Merge pull request #945 from mattermost/plt-433 | Christopher Speller | 2015-10-07 | 2 | -65/+78 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-433 Allow team admin to delete comments. | ||||
| * | | | | | Allow team admin to delete comments. | JoramWilander | 2015-10-06 | 2 | -65/+78 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #943 from mattermost/plt-444 | Christopher Speller | 2015-10-07 | 2 | -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. | JoramWilander | 2015-10-06 | 2 | -12/+33 |
| | | | | | | |||||
* | | | | | | Merge pull request #946 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-10-07 | 9 | -26/+38 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | PLT-451 - Adding visual effect for logout active sessions button | ||||
| * | | | | | Removing sidebar text hover color | Asaad Mahmood | 2015-10-06 | 4 | -15/+5 |
| | | | | | | |||||
| * | | | | | Changing link colour opacity LHS | Asaad Mahmood | 2015-10-06 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Updating link color opacity in LHS | Asaad Mahmood | 2015-10-06 | 2 | -11/+11 |
| | | | | | | |||||
| * | | | | | Removing console.log | Asaad Mahmood | 2015-10-06 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | PLT-451 - Adding visual effect for logout active sessions button | Asaad Mahmood | 2015-10-06 | 6 | -5/+28 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #938 from mattermost/plt-111 | Corey Hulen | 2015-10-06 | 5 | -23/+38 |
|\ \ \ \ \ | |/ / / / |/| | | | | PLT-111 Combining email verification confirmation screen with login screen. | ||||
| * | | | | Combining email verification confirmation screen with login screen. | Christopher Speller | 2015-10-06 | 5 | -23/+38 |
| | | | | | |||||
* | | | | | Merge pull request #939 from asaadmahmoodspin/plt-424 | Corey Hulen | 2015-10-06 | 9 | -307/+318 |
|\ \ \ \ \ | | | | | | | | | | | | | Admin console UI Improvements | ||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/mattermost/platform into plt-424 | Asaad Mahmood | 2015-10-06 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | PLT-432 - Status icon for active LHS item the same as text color | Asaad Mahmood | 2015-10-06 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Admin console UI Improvements | Asaad Mahmood | 2015-10-06 | 8 | -307/+317 |
| | |_|_|_|/ | |/| | | | |