Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #970 from mattermost/GIT-957 | Harrison Healey | 2015-10-08 | 3 | -3/+3 |
|\ | | | | | GIT-957 fixing email templates and logos | ||||
| * | GIT-957 fixing email templates and logos | =Corey Hulen | 2015-10-07 | 3 | -3/+3 |
| | | |||||
* | | 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 | 2 | -43/+58 |
| | | | |||||
| * | | PLT-445 Create About dialog | Tomi M | 2015-10-06 | 3 | -11/+69 |
| | | | |||||
* | | | 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 | 1 | -19/+53 |
|\ \ \ | | | | | | | | | 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 | 1 | -18/+47 |
| | |/ | |/| | |||||
* | | | Merge pull request #961 from mattermost/plt-471 | Corey Hulen | 2015-10-07 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | PLT-471 Fix user_added websocket event | ||||
| * | | | Fix user_added websocket event and update websocket channel access cache on ↵ | JoramWilander | 2015-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | add/remove member. | ||||
* | | | | 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 | 1 | -7/+7 |
|\ \ \ \ | |_|/ / |/| | | | PLT-522 - Adding option for mentionHighlightLink for themes | ||||
| * | | | PLT-522 - Adding option for mentionHighlightLink for themes | Asaad Mahmood | 2015-10-07 | 1 | -7/+7 |
| |/ / | |||||
* | | | 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 | 2 | -1/+5 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-451 - Adding visual effect for logout active sessions button | ||||
| * | | | Removing sidebar text hover color | Asaad Mahmood | 2015-10-06 | 1 | -1/+0 |
| | | | | |||||
| * | | | 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 | 1 | -0/+6 |
| | |/ | |/| | |||||
* | | | Merge pull request #938 from mattermost/plt-111 | Corey Hulen | 2015-10-06 | 2 | -2/+14 |
|\ \ \ | |/ / |/| | | PLT-111 Combining email verification confirmation screen with login screen. | ||||
| * | | Combining email verification confirmation screen with login screen. | Christopher Speller | 2015-10-06 | 2 | -2/+14 |
| |/ | |||||
* | | Merge pull request #939 from asaadmahmoodspin/plt-424 | Corey Hulen | 2015-10-06 | 5 | -142/+144 |
|\ \ | | | | | | | Admin console UI Improvements | ||||
| * | | Admin console UI Improvements | Asaad Mahmood | 2015-10-06 | 5 | -142/+144 |
| |/ | |||||
* / | Hid Copy Link button when unable to copy the team signup link | hmhealey | 2015-10-06 | 1 | -11/+18 |
|/ | |||||
* | 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 | 2 | -4/+3 |
|\ | | | | | Multiple UI Improvements | ||||
| * | Multiple UI Improvements | Asaad Mahmood | 2015-10-05 | 2 | -4/+3 |
| | | |||||
* | | Merge pull request #922 from mattermost/plt-360 | Harrison Healey | 2015-10-05 | 27 | -289/+326 |
|\ \ | |/ |/| | PLT-360 Upgrade and changes to ESLint | ||||
| * | Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. ↵ | Christopher Speller | 2015-10-05 | 27 | -289/+326 |
| | | | | | | | | 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 | 5 | -9/+121 |
|\ \ \ | |_|/ |/| | | 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 | 4 | -14/+91 |
| | | | | | | | | | | | | next to webhook posts. | ||||
| * | | Add ability to override username and icon for posts from incoming webhooks. | JoramWilander | 2015-10-02 | 4 | -8/+43 |
| | | | |||||
* | | | Merge pull request #903 from mattermost/PLT-44 | Christopher Speller | 2015-10-05 | 3 | -6/+13 |
|\ \ \ | | | | | | | | | PLT-44 allow team switching without the need to login |