Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updating logo image url in authorise | Asaad Mahmood | 2015-10-23 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-23 | 100 | -623/+1159 |
|\ | | | | | | | ui-improvements | ||||
| * | Merge pull request #1153 from mattermost/fixing-eslint | Corey Hulen | 2015-10-22 | 1 | -0/+1 |
| |\ | | | | | | | Fixing merge | ||||
| | * | Fixing merge | =Corey Hulen | 2015-10-22 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #1150 from hmhealey/plt689 | Corey Hulen | 2015-10-22 | 1 | -28/+28 |
| |\ | | | | | | | PLT-689 Fixed handling of whitespace surrounding emoticons | ||||
| | * | Fixed handling of whitespace surrounding emoticons | hmhealey | 2015-10-22 | 1 | -28/+28 |
| | | | |||||
| * | | Merge pull request #1147 from hmhealey/plt721 | Corey Hulen | 2015-10-22 | 1 | -1/+1 |
| |\ \ | | | | | | | | | PLT-721 Changed Direct Channel modal to only show active users | ||||
| | * | | Changed Direct Channel modal to only show active users | hmhealey | 2015-10-22 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #1146 from hmhealey/plt759 | Corey Hulen | 2015-10-22 | 1 | -5/+7 |
| |\ \ | | | | | | | | | PLT-759 Made searching case insensitive in Direct Messages modal | ||||
| | * | | Made searching case insensitive in Direct Messages modal | hmhealey | 2015-10-22 | 1 | -5/+7 |
| | |/ | |||||
| * | | Merge pull request #1145 from hmhealey/plt719 | Corey Hulen | 2015-10-22 | 2 | -1/+51 |
| |\ \ | | | | | | | | | PLT-719 Added help popover to search box | ||||
| | * | | Added help popover to search box | hmhealey | 2015-10-22 | 2 | -1/+51 |
| | | | | |||||
| * | | | Merge pull request #1143 from mattermost/plt-803 | Corey Hulen | 2015-10-22 | 3 | -1/+36 |
| |\ \ \ | | | | | | | | | | | PLT-803 Prevent users from resetting their password when the user is using SSO | ||||
| | * | | | Prevent users from resetting their password when the user is using SSO | JoramWilander | 2015-10-22 | 3 | -1/+36 |
| | | | | | |||||
| * | | | | Merge pull request #1142 from mattermost/plt-414 | Corey Hulen | 2015-10-22 | 4 | -63/+255 |
| |\ \ \ \ | | | | | | | | | | | | | PLT-414 Fix direct channel creation. | ||||
| | * | | | | Refactoring direct channel creation to use transaction to avaoid state where ↵ | Christopher Speller | 2015-10-22 | 4 | -63/+255 |
| | | | | | | | | | | | | | | | | | | | | | | | | channel is created without both users | ||||
| * | | | | | Merge pull request #1137 from mattermost/email-trouble | Corey Hulen | 2015-10-22 | 1 | -6/+49 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Update email setup instructions | ||||
| | * | | | | | tweaking formatting | =Corey Hulen | 2015-10-21 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | tweaking formatting | =Corey Hulen | 2015-10-21 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | Removing old dock | =Corey Hulen | 2015-10-21 | 1 | -49/+0 |
| | | | | | | | |||||
| | * | | | | | Updating email guide | =Corey Hulen | 2015-10-21 | 2 | -14/+85 |
| | | | | | | | |||||
| | * | | | | | WIP | =Corey Hulen | 2015-10-21 | 1 | -0/+21 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1129 from mattermost/PLT-44 | Corey Hulen | 2015-10-22 | 88 | -477/+644 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-44 Inital support for multi-tab multi-team login | ||||
| | * | | | | | | Fixing merge | =Corey Hulen | 2015-10-22 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-22 | 3 | -41/+87 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Create API.md | it33 | 2015-10-22 | 1 | -0/+35 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1138 from rgarmsen2295/plt-777 | Harrison Healey | 2015-10-22 | 2 | -41/+52 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | PLT-777 Convert window resizing in post_list.jsx to React based implementation | ||||
| | * | | | | | | Fixed typos in create_post.jsx resizing code | Reed Garmsen | 2015-10-21 | 2 | -13/+11 |
| | | | | | | | | |||||
| | * | | | | | | Changed post list resize code to use react state; fixed various eslint warnings | Reed Garmsen | 2015-10-21 | 1 | -38/+51 |
| | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Fixing code review issues | =Corey Hulen | 2015-10-22 | 3 | -6/+5 |
| | | | | | | | |||||
| | | * | | | | Fixing group code review issues | =Corey Hulen | 2015-10-22 | 3 | -4/+5 |
| | | | | | | | |||||
| | | * | | | | Addressing issues from group code review | =Corey Hulen | 2015-10-22 | 3 | -28/+29 |
| | | | | | | | |||||
| | | * | | | | Fixing merge conflict | =Corey Hulen | 2015-10-22 | 31 | -119/+577 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | | * | | | | Fixing admin console | =Corey Hulen | 2015-10-20 | 2 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | fixing eslint errors | =Corey Hulen | 2015-10-20 | 5 | -3/+5 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-20 | 32 | -156/+777 |
| | | |\| | | | |||||
| | | * | | | | Multi-session login | =Corey Hulen | 2015-10-20 | 26 | -108/+143 |
| | | | | | | | |||||
| | | * | | | | Adding multi-session cookie | =Corey Hulen | 2015-10-20 | 8 | -94/+78 |
| | | | | | | | |||||
| | | * | | | | Fixing merge conflicts | =Corey Hulen | 2015-10-19 | 28 | -115/+1623 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Fixing merge issue | =Corey Hulen | 2015-10-19 | 1 | -8/+3 |
| | | | | | | | | |||||
| | | * | | | | | Merging from master | =Corey Hulen | 2015-10-19 | 42 | -403/+602 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Refactoring web classes to use multi-session | =Corey Hulen | 2015-10-16 | 4 | -94/+138 |
| | | | | | | | | | |||||
| | | * | | | | | | Fixing merge | =Corey Hulen | 2015-10-16 | 37 | -165/+642 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Inital support for multi-tab loging | =Corey Hulen | 2015-10-16 | 64 | -300/+396 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Updating lattermost icon size | Asaad Mahmood | 2015-10-22 | 3 | -0/+0 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Updating mattermost logo | Asaad Mahmood | 2015-10-22 | 7 | -2/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Updating disabled form control | Asaad Mahmood | 2015-10-22 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-22 | 7 | -28/+87 |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changing the UI for the active item in the nav - Updating the UI for drag and drop - Fixing z-index for date selector | ||||
* | | | | | | | | | Update Troubleshooting.md | it33 | 2015-10-22 | 1 | -3/+7 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1141 from hmhealey/plt521b | Harrison Healey | 2015-10-22 | 3 | -2/+16 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | PLT-521 Changed markdown renderer to only parse emoticons twice |