Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Fixed some console errors with the search autocomplete when there are no ↵ | hmhealey | 2015-11-13 | 1 | -5/+7 | |
| | | | | | | | | | | | | | | | | | | | | suggestions to show | |||||
* | | | | | Merge release branch 'release-1.2' | Christopher Speller | 2015-11-13 | 3 | -3/+9 | |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | ||||||
| * | | | Added null check when accessing post text | hmhealey | 2015-11-13 | 1 | -2/+3 | |
| | | | | ||||||
| * | | | Updating bad connection css | Asaad Mahmood | 2015-11-13 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | UI changes for Direct messages and Bad connection | Asaad Mahmood | 2015-11-13 | 1 | -0/+4 | |
| | | | | ||||||
* | | | | Merge pull request #1422 from hmhealey/plt906 | Christopher Speller | 2015-11-13 | 1 | -8/+14 | |
|\ \ \ \ | |_|_|/ |/| | | | PLT-906 Improved client-side handling when ExtraInfo.MemberCount may not be set | |||||
| * | | | Made code for the member popover count a bit more robust to hopefully ↵ | hmhealey | 2015-11-13 | 1 | -8/+14 | |
| | | | | | | | | | | | | | | | | prevent issues involving old data | |||||
* | | | | Merge pull request #1415 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-11-13 | 6 | -20/+29 | |
|\ \ \ \ | |_|_|/ |/| | | | Multiple UI improvements | |||||
| * | | | Small fix for time in RHS | Asaad Mahmood | 2015-11-13 | 1 | -3/+9 | |
| | | | | ||||||
| * | | | Updating post.scss due to merge issues | Asaad Mahmood | 2015-11-13 | 1 | -4/+7 | |
| | | | | ||||||
| * | | | Updating post.scss | Asaad Mahmood | 2015-11-13 | 1 | -75/+91 | |
| | | | | ||||||
| * | | | Fixing eslint error | Asaad Mahmood | 2015-11-13 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Multiple UI improvements | Asaad Mahmood | 2015-11-13 | 6 | -113/+98 | |
| |/ / | ||||||
* | | | Merge pull request #1419 from hmhealey/plt998 | Joram Wilander | 2015-11-13 | 1 | -18/+86 | |
|\ \ \ | |/ / |/| | | PLT-998/999/1100 Improving search term highlighting in results | |||||
| * | | Improved highlighting of search flags to handle quotes and flags | hmhealey | 2015-11-12 | 1 | -18/+86 | |
| | | | ||||||
* | | | Merge pull request #1417 from florianorben/PLT-1141 | Christopher Speller | 2015-11-13 | 1 | -0/+1 | |
|\ \ \ | | | | | | | | | PLT-1141: Page previews can overflow their boundaries | |||||
| * | | | PLT-1141: Page previews can overflow their boundaries | Florian Orben | 2015-11-12 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Fixing bad merge | Christopher Speller | 2015-11-12 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'release-1.2' | Christopher Speller | 2015-11-12 | 8 | -22/+48 | |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | ||||||
| * | | Adding safari 8 to list of unsupported browsers. | Christopher Speller | 2015-11-12 | 1 | -2/+2 | |
| | | | ||||||
| * | | Make import/export theme input box editable | JoramWilander | 2015-11-12 | 1 | -1/+0 | |
| | | | ||||||
| * | | Remove unneed role | JoramWilander | 2015-11-11 | 1 | -2/+0 | |
| | | | ||||||
| * | | Remove unneed argument | JoramWilander | 2015-11-11 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix channel invite button on channel intro message and fix empty channel ↵ | JoramWilander | 2015-11-11 | 4 | -18/+23 | |
| | | | | | | | | | | | | invite modal. | |||||
| * | | Added text to the edit channel purpose menu option on mobile | hmhealey | 2015-11-10 | 1 | -1/+3 | |
| | | | ||||||
| * | | Updated post components to re-render after first receiving user profiles | hmhealey | 2015-11-09 | 1 | -1/+22 | |
| | | | ||||||
* | | | Merge pull request #1412 from mattermost/plt-1089 | Corey Hulen | 2015-11-12 | 2 | -1/+5 | |
|\ \ \ | | | | | | | | | PLT-1089 Fix profile not loading in RHS on refresh | |||||
| * | | | Fix profile loading in RHS on refresh | JoramWilander | 2015-11-12 | 2 | -1/+5 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #1409 from mattermost/plt-961 | Corey Hulen | 2015-11-12 | 28 | -47/+138 | |
|\ \ \ | | | | | | | | | PLT-961 Rename areStatesEqual to areObjectsEqual and make it more comprehensive and accurate. | |||||
| * | | | Rename areStatesEqual to areObjectsEqual and make it more comprehensive and ↵ | JoramWilander | 2015-11-12 | 28 | -47/+138 | |
| |/ / | | | | | | | | | | accurate. | |||||
* | | | Merge pull request #1407 from mattermost/plt-1041 | Corey Hulen | 2015-11-12 | 1 | -3/+5 | |
|\ \ \ | | | | | | | | | PLT-1041 Fix multiple pending/errored posts | |||||
| * | | | Fix multiple pending/errored posts | JoramWilander | 2015-11-12 | 1 | -3/+5 | |
| |/ / | ||||||
* | | | Merge pull request #1411 from hmhealey/plt876 | Christopher Speller | 2015-11-12 | 1 | -0/+2 | |
|\ \ \ | | | | | | | | | PLT-876 Sorted channel list before rendering them in the sidebar | |||||
| * | | | Sorted channel list before rendering them in the sidebar | hmhealey | 2015-11-12 | 1 | -0/+2 | |
| |/ / | ||||||
* | | | Merge pull request #1410 from hmhealey/plt906 | Christopher Speller | 2015-11-12 | 2 | -3/+7 | |
|\ \ \ | | | | | | | | | PLT-906 Added ChannelExtra.MemberCount field | |||||
| * | | | Added ChannelExtra.MemberCount field to reflect the actual member count when ↵ | hmhealey | 2015-11-12 | 2 | -3/+7 | |
| |/ / | | | | | | | | | | we truncate the list of members to 20 | |||||
* | | | Merge pull request #1408 from hmhealey/plt922 | Christopher Speller | 2015-11-12 | 1 | -15/+29 | |
|\ \ \ | | | | | | | | | PLT-922 Added feedback to the Invite Members modal to indicate that emails are currently being sent | |||||
| * | | | Added feedback to the Invite Members modal to indicate that emails are ↵ | hmhealey | 2015-11-12 | 1 | -15/+29 | |
| |/ / | | | | | | | | | | currently being sent | |||||
* | | | Updating profile image and textbox resizing | Asaad Mahmood | 2015-11-12 | 2 | -3/+6 | |
| | | | ||||||
* | | | Fixing preview stuff for the RHS | Asaad Mahmood | 2015-11-12 | 2 | -5/+15 | |
| | | | ||||||
* | | | UI Improvements for centre channel due to preview | Asaad Mahmood | 2015-11-12 | 5 | -24/+33 | |
|/ / | ||||||
* | | Merge pull request #1352 from florianorben/PLT-1049 | Joram Wilander | 2015-11-11 | 5 | -20/+479 | |
|\ \ | | | | | | | PLT-1049: Vine URLs should not generate preview links | |||||
| * | | move provider.json to components folder; fix indentation; add json files to ↵ | Florian Orben | 2015-11-10 | 4 | -325/+326 | |
| | | | | | | | | | | | | eslintignore | |||||
| * | | PLT-1049: Vine URLs should not generate preview links | Florian Orben | 2015-11-10 | 4 | -20/+478 | |
| | | | ||||||
* | | | Merge pull request #1389 from florianorben/preview-markdown | Christopher Speller | 2015-11-11 | 3 | -6/+54 | |
|\ \ \ | |/ / |/| | | Preview markdown post | |||||
| * | | add button to preview your current post | Florian Orben | 2015-11-10 | 3 | -6/+54 | |
| | | | ||||||
* | | | fix indentation to use tabs | Florian Orben | 2015-11-10 | 2 | -80/+80 | |
| | | | ||||||
* | | | Add latex support | Florian Orben | 2015-11-10 | 86 | -2/+24 | |
|/ / | | | | | | | | | | | Adds latex highlighting support via https://www.npmjs.com/package/katex as requested in https://mattermost.uservoice.com/forums/306457-general/suggestions/10160757-add-latex-support | |||||
* | | Merge pull request #1365 from hmhealey/eslintbabel | Christopher Speller | 2015-11-10 | 2 | -1/+3 | |
|\ \ | | | | | | | Switched eslint to use babel-eslint parser | |||||
| * | | Switched eslint to use babel-eslint parser | hmhealey | 2015-11-09 | 2 | -1/+3 | |
| | | |