Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-26 | 6 | -19/+179 |
|\ | |||||
| * | Merge pull request #1178 from mattermost/update-web-socket-help | Corey Hulen | 2015-10-26 | 1 | -1/+1 |
| |\ | | | | | | | Update web socket help | ||||
| | * | Update websocket error | it33 | 2015-10-25 | 1 | -1/+1 |
| | | | | | | | | | Getting this error when websockets is properly configured and connection is just slow | ||||
| * | | Merge pull request #1189 from mattermost/plt-762 | Joram Wilander | 2015-10-26 | 2 | -2/+3 |
| |\ \ | | | | | | | | | PLT-762 Fix error message on leaving channel | ||||
| | * | | Fix error message on leaving channel | JoramWilander | 2015-10-26 | 2 | -2/+3 |
| | | | | |||||
| * | | | PLT-703: Support multiple users being shown as typing underneath input boxes. | Florian Orben | 2015-10-26 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge pull request #1171 from ↵ | Harrison Healey | 2015-10-26 | 1 | -14/+48 |
| |\ \ | | | | | | | | | | | | | | | | | trashcan/github-1130-handle-trailing-characters-after-user Handle trailing characters after user | ||||
| | * | | Fix highlighting of trailing punctuation for own username | Pat Lathem | 2015-10-25 | 1 | -4/+4 |
| | | | | |||||
| | * | | Fix off by one error | Pat Lathem | 2015-10-24 | 1 | -7/+7 |
| | | | | |||||
| | * | | Remove trailing punctuation when parsing @username references | Pat Lathem | 2015-10-24 | 1 | -13/+47 |
| | | | | |||||
| * | | | Merge pull request #1170 from florianorben/PLT-395 | Harrison Healey | 2015-10-26 | 3 | -0/+123 |
| |\ \ \ | | | | | | | | | | | PLT-395: Add syntax highlighting to Markdown code blocks | ||||
| | * | | | Add java and ini language | Florian Orben | 2015-10-24 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | Forgot to add those altough they are quite common | ||||
| | * | | | fix markup if code is of unknown language | Florian Orben | 2015-10-24 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | code style theme chooser | Florian Orben | 2015-10-24 | 2 | -0/+33 |
| | | | | | |||||
| | * | | | highlight code in markdown blocks | Florian Orben | 2015-10-24 | 2 | -0/+84 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #1183 from girishso/strip-extra-s | Harrison Healey | 2015-10-26 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | strip extra hyphens from urls | ||||
| | * | | | strips extra hiphens from channel url | Girish S | 2015-10-26 | 1 | -0/+1 |
| | |/ / | |||||
| * | | | made eslint happy | Girish S | 2015-10-26 | 1 | -3/+2 |
| | | | | |||||
| * | | | append * to search query if not present and highlight partial matches | Girish S | 2015-10-26 | 1 | -2/+3 |
| |/ / | |||||
* | | | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-25 | 3 | -6/+8 |
|\| | | |||||
| * | | Merge pull request #1133 from hmhealey/plt718 | Corey Hulen | 2015-10-23 | 1 | -1/+2 |
| |\ \ | | | | | | | | | PLT-718 Add an autocomplete when searching with in:, channel:, or from: | ||||
| | * | | Added keyboard selection to search autocomplete | hmhealey | 2015-10-23 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-23 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | ui-improvements | ||||
| | * | | Force updating last viewed at for new posts | JoramWilander | 2015-10-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Updating nav active bg and Send invitation button | Asaad Mahmood | 2015-10-23 | 1 | -0/+1 |
| | | | | |||||
| * | | | Updating bot styling | Asaad Mahmood | 2015-10-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-23 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'master' into PLT-25 | =Corey Hulen | 2015-10-23 | 5 | -57/+61 |
|\| | | |||||
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-23 | 5 | -44/+52 |
| |\ \ | | | | | | | | | | | | | ui-improvements | ||||
| | * \ | 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 |
| | | | | | |||||
| | * | | | Fixing group code review issues | =Corey Hulen | 2015-10-22 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Fixing merge conflict | =Corey Hulen | 2015-10-22 | 4 | -3/+20 |
| | |\| | | |||||
| | * | | | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-20 | 2 | -2/+11 |
| | |\ \ \ | |||||
| | * | | | | Multi-session login | =Corey Hulen | 2015-10-20 | 2 | -9/+17 |
| | | | | | | |||||
| | * | | | | Adding multi-session cookie | =Corey Hulen | 2015-10-20 | 1 | -8/+8 |
| | | | | | | |||||
| | * | | | | Fixing merge conflicts | =Corey Hulen | 2015-10-19 | 2 | -0/+59 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merging from master | =Corey Hulen | 2015-10-19 | 2 | -1/+14 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Fixing merge | =Corey Hulen | 2015-10-16 | 4 | -22/+52 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Inital support for multi-tab loging | =Corey Hulen | 2015-10-16 | 3 | -13/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | Updating mattermost logo | Asaad Mahmood | 2015-10-22 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-22 | 2 | -12/+8 |
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changing the UI for the active item in the nav - Updating the UI for drag and drop - Fixing z-index for date selector | ||||
* / | | | | | | | Adding analytics tab | =Corey Hulen | 2015-10-22 | 1 | -0/+14 |
|/ / / / / / / | |||||
* | | | | | | | 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 |
| | |_|_|_|/ | |/| | | | |