Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-23 | 1 | -1/+2 | |
| | |\ \ | |_|/ / |/| | | | | | | | ui-improvements | |||||
* | | | | Update Troubleshooting.md | it33 | 2015-10-23 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | Updating bot styling | Asaad Mahmood | 2015-10-23 | 2 | -6/+7 | |
| | | | | ||||||
| | * | | Multiple UI Improvements | Asaad Mahmood | 2015-10-23 | 10 | -90/+172 | |
| |/ / |/| | | ||||||
* | | | Adding limitations section | it33 | 2015-10-23 | 1 | -0/+4 | |
|/ / | ||||||
* | | Merge pull request #1140 from mattermost/plt-787 | Harrison Healey | 2015-10-23 | 4 | -5/+79 | |
|\ \ | | | | | | | PLT-787 Auto-embed gifs from .gif links | |||||
| * | | Make sure gif only loads once | JoramWilander | 2015-10-23 | 1 | -0/+7 | |
| | | | ||||||
| * | | Auto-embed gifs from .gif links | JoramWilander | 2015-10-23 | 4 | -5/+72 | |
| | | | ||||||
* | | | Merge pull request #1157 from mattermost/websocket-fix | Christopher Speller | 2015-10-23 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fix websocket not connecting when session index is 0 | |||||
| * | | | Fix websocket not connecting when session index is 0 | JoramWilander | 2015-10-23 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Added v1.1.1 Release Notes | it33 | 2015-10-23 | 1 | -0/+25 | |
| | | | ||||||
* | | | Merge pull request #1149 from mattermost/plt-808 | Christopher Speller | 2015-10-23 | 6 | -26/+111 | |
|\ \ \ | | | | | | | | | PLT-808 Fix deleting channels breaking the webhook UI | |||||
| * | | | Delete webhooks when the associated channel gets deleted | JoramWilander | 2015-10-22 | 3 | -0/+49 | |
| | | | | ||||||
| * | | | In webhooks UI handle error if channel can't be found, also use display name ↵ | JoramWilander | 2015-10-22 | 3 | -26/+62 | |
| | | | | | | | | | | | | | | | | over url name, plus warning fixes | |||||
* | | | | Merge pull request #1152 from jlebleu/PLT-797 | Joram Wilander | 2015-10-23 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | PLT-797 Update System Table with latest version | |||||
| * | | | | PLT-797 Update System Table with latest version | Jean-Yves LEBLEU | 2015-10-23 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Update database system table with last version if coming from a 7.X version | |||||
* | | | | | Merge pull request #1148 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-10-23 | 17 | -42/+125 | |
|\ \ \ \ \ | | | | | | | | | | | | | Ui improvements | |||||
| * | | | | | Improving the favicon image | Asaad Mahmood | 2015-10-23 | 2 | -0/+0 | |
| | | | | | | ||||||
| * | | | | | Changing popover help opacity | Asaad Mahmood | 2015-10-23 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Improving UI for the search popover | Asaad Mahmood | 2015-10-23 | 3 | -11/+34 | |
| | | | | | | ||||||
| * | | | | | 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 | |||||
| * | | | | | 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 | |||||
* | | | | | Merge pull request #1155 from lindy65/patch-3 | Joram Wilander | 2015-10-23 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fixed grammatical error on line 19 | |||||
| * | | | | Fixed grammatical error on line 19 | lindy65 | 2015-10-23 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | Took "how" out "....URLs matches HOW your server configuration." | |||||
* | | | | 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 | |
| | | | | | | | |