Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 1 | -17/+22 |
|\ \ \ | |/ / |/| | | 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 | 1 | -17/+22 |
| | | | |||||
* | | | 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 #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 | 2 | -21/+24 |
|\ \ \ | | | | | | | | | PLT-435 adding ability to demote system admin | ||||
| * | | | 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 #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 | ||||
| * | | | 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 |
| | |/ | |/| | |||||
* | | | Merge pull request #941 from hmhealey/plt515 | Corey Hulen | 2015-10-06 | 1 | -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 link | hmhealey | 2015-10-06 | 1 | -11/+18 |
| |/ | |||||
* | | Merge pull request #935 from mattermost/remove-zeroclipboard | Christopher Speller | 2015-10-06 | 1 | -1/+0 |
|\ \ | | | | | | | Remove npm reference to unused zeroclipboard. | ||||
| * | | Remove npm reference to unused zeroclipboard. | JoramWilander | 2015-10-06 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #934 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2015-10-06 | 8 | -21/+51 |
|\ \ \ | |_|/ |/| | | Multiple UI Improvements | ||||
| * | | Updating form-control focus | Asaad Mahmood | 2015-10-06 | 2 | -2/+6 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-06 | 2 | -3/+3 |
| |\ \ | | | | | | | | | | | | | ui-improvements | ||||
| * | | | Adding mention highlight setting and improving search highlight too | Asaad Mahmood | 2015-10-06 | 4 | -9/+32 |
| | | | | |||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-06 | 5 | -12/+15 |
| | |/ | |/| | |||||
* | | | Merge pull request #936 from mattermost/signup-fix | Joram Wilander | 2015-10-06 | 1 | -13/+14 |
|\ \ \ | |_|/ |/| | | Fixing broken signup page | ||||
| * | | Fixing broken signup page | Christopher Speller | 2015-10-06 | 1 | -13/+14 |
| |/ | |||||
* / | Fixed Get Public Link button | hmhealey | 2015-10-05 | 2 | -3/+3 |
|/ | |||||
* | Merge pull request #925 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-10-05 | 8 | -24/+20 |
|\ | | | | | Multiple UI Improvements | ||||
| * | Multiple UI Improvements | Asaad Mahmood | 2015-10-05 | 8 | -24/+20 |
| | | |||||
* | | Merge pull request #922 from mattermost/plt-360 | Harrison Healey | 2015-10-05 | 33 | -308/+350 |
|\ \ | |/ |/| | PLT-360 Upgrade and changes to ESLint | ||||
| * | Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. ↵ | Christopher Speller | 2015-10-05 | 33 | -308/+350 |
| | | | | | | | | Adding new ESLint rules. Fixing new ESLint errors. | ||||
* | | Merge pull request #923 from mattermost/fix-load-scroll | Corey Hulen | 2015-10-05 | 1 | -1/+1 |
|\ \ | | | | | | | Fix missed binding for youtube data callback. | ||||
| * | | Fix missed binding for youtube data callback. | JoramWilander | 2015-10-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #914 from mattermost/plt-297 | Joram Wilander | 2015-10-05 | 7 | -9/+147 |
|\ \ \ | |_|/ |/| | | 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. | JoramWilander | 2015-10-05 | 1 | -1/+1 |
| | | | |||||
| * | | Add config options for overriding username and icon, and add BOT indicator ↵ | JoramWilander | 2015-10-05 | 6 | -16/+108 |
| | | | | | | | | | | | | next to webhook posts. | ||||
| * | | Add ability to override username and icon for posts from incoming webhooks. | JoramWilander | 2015-10-02 | 5 | -8/+54 |
| | | | |||||
* | | | Merge pull request #915 from mattermost/plt-300 | Christopher Speller | 2015-10-05 | 4 | -28/+62 |
|\ \ \ | | | | | | | | | 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. | JoramWilander | 2015-10-02 | 4 | -28/+62 |
| | |/ | |/| | |||||
* | | | Merge pull request #903 from mattermost/PLT-44 | Christopher Speller | 2015-10-05 | 5 | -17/+69 |
|\ \ \ | | | | | | | | | PLT-44 allow team switching without the need to login |