Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
| |/ / | ||||||
* | | | Merge pull request #1149 from mattermost/plt-808 | Christopher Speller | 2015-10-23 | 3 | -26/+62 | |
|\ \ \ | | | | | | | | | PLT-808 Fix deleting channels breaking the webhook UI | |||||
| * | | | 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 | |||||
* | | | | Improving UI for the search popover | Asaad Mahmood | 2015-10-23 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-23 | 56 | -337/+444 | |
|\ \ \ \ | | |/ / | |/| | | | | | | ui-improvements | |||||
| * | | | 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 | 1 | -1/+32 | |
| |\ \ \ | | | | | | | | | | | PLT-719 Added help popover to search box | |||||
| | * | | | Added help popover to search box | hmhealey | 2015-10-22 | 1 | -1/+32 | |
| | | | | | ||||||
| * | | | | Fixing merge | =Corey Hulen | 2015-10-22 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-22 | 2 | -41/+52 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | 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 group code review issues | =Corey Hulen | 2015-10-22 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Addressing issues from group code review | =Corey Hulen | 2015-10-22 | 1 | -7/+20 | |
| | | | | | ||||||
| * | | | | Fixing merge conflict | =Corey Hulen | 2015-10-22 | 11 | -34/+333 | |
| |\| | | | ||||||
| * | | | | 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 | 8 | -41/+104 | |
| |\ \ \ \ | ||||||
| * | | | | | Multi-session login | =Corey Hulen | 2015-10-20 | 20 | -29/+43 | |
| | | | | | | ||||||
| * | | | | | Adding multi-session cookie | =Corey Hulen | 2015-10-20 | 1 | -8/+8 | |
| | | | | | | ||||||
| * | | | | | Fixing merge conflicts | =Corey Hulen | 2015-10-19 | 7 | -29/+422 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merging from master | =Corey Hulen | 2015-10-19 | 26 | -314/+460 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Refactoring web classes to use multi-session | =Corey Hulen | 2015-10-16 | 1 | -3/+4 | |
| | | | | | | | | ||||||
| * | | | | | | | Fixing merge | =Corey Hulen | 2015-10-16 | 17 | -37/+377 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Inital support for multi-tab loging | =Corey Hulen | 2015-10-16 | 35 | -229/+259 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Updating mattermost logo | Asaad Mahmood | 2015-10-22 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-22 | 3 | -25/+23 | |
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changing the UI for the active item in the nav - Updating the UI for drag and drop - Fixing z-index for date selector | |||||
* | | | | | | | | Changed markdown renderer to only parse emoticons twice | hmhealey | 2015-10-22 | 2 | -1/+15 | |
| | | | | | | | | ||||||
* | | | | | | | | Fixed improperly quoted html attributes for emoticons | hmhealey | 2015-10-22 | 1 | -1/+1 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Merge pull request #1135 from trashcan/PLT-521 | Harrison Healey | 2015-10-22 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | PLT-521: Fix emoji with underscores | |||||
| * | | | | | | Pass eslint tests | Pat Lathem | 2015-10-21 | 1 | -3/+3 | |
| | | | | | | | ||||||
| * | | | | | | Missing semicolon | Pat Lathem | 2015-10-21 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Remove stray emoticons.jsx import | Pat Lathem | 2015-10-21 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | Add a call to doFormatText inside of the markdown paragraph handler | Pat Lathem | 2015-10-21 | 1 | -0/+3 | |
| | | | | | | | ||||||
* | | | | | | | Change stop symbol to another one since chrome-win can't display it | Florian Orben | 2015-10-21 | 2 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | apply portrait/landscape/quadrat format to playing gif to always display it ↵ | Florian Orben | 2015-10-21 | 1 | -3/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | in best possible way | |||||
* | | | | | | | Add stop button to stop animated gifs | Florian Orben | 2015-10-21 | 3 | -42/+106 | |
| | | | | | | | ||||||
* | | | | | | | Horizontally align images if image height > image width | Florian Orben | 2015-10-21 | 1 | -3/+15 | |
| | | | | | | | ||||||
* | | | | | | | PLT-616: Enable playing of animated GIF in thumbnails and preview | Florian Orben | 2015-10-21 | 3 | -4/+120 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #1131 from mattermost/PLT-350 | Christopher Speller | 2015-10-21 | 2 | -4/+40 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-350 allow ability to disable restricted team names | |||||
| * | | | | | | | PLT-350 allow ability to disable restricted team names | =Corey Hulen | 2015-10-20 | 2 | -4/+40 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #1103 from florianorben/PLT-751 | Harrison Healey | 2015-10-21 | 2 | -3/+34 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | PLT-751: Enable arrow to edit posts in comment threads |