Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | PLT-924: Combine sequential messages from same user to look like one message ↵ | Florian Orben | 2015-11-16 | 1 | -6/+11 |
| | | | | (still edits as separate messages) | ||||
* | Merge pull request #1431 from hmhealey/plt1149 | Joram Wilander | 2015-11-14 | 1 | -5/+7 |
|\ | | | | | PLT-1149 Fixed some console errors related to the search autocomplete | ||||
| * | 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 | 2 | -2/+7 |
|\ \ | |/ |/| | |||||
| * | Added null check when accessing post text | hmhealey | 2015-11-13 | 1 | -2/+3 |
| | | |||||
| * | 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 | 2 | -7/+3 |
|\ \ \ | | | | | | | | | Multiple UI improvements | ||||
| * | | | Fixing eslint error | Asaad Mahmood | 2015-11-13 | 1 | -1/+0 |
| | | | | |||||
| * | | | Multiple UI improvements | Asaad Mahmood | 2015-11-13 | 2 | -6/+3 |
| |/ / | |||||
* | | | 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 |
| | | | |||||
* | | | Fixing bad merge | Christopher Speller | 2015-11-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'release-1.2' | Christopher Speller | 2015-11-12 | 7 | -20/+46 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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 | 1 | -3/+2 |
| | | | |||||
* | | | UI Improvements for centre channel due to preview | Asaad Mahmood | 2015-11-12 | 1 | -1/+1 |
|/ / | |||||
* | | 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 | 1 | -4/+38 |
|\ \ \ | |/ / |/| | | Preview markdown post | ||||
| * | | add button to preview your current post | Florian Orben | 2015-11-10 | 1 | -4/+38 |
| | | | |||||
* | | | fix indentation to use tabs | Florian Orben | 2015-11-10 | 1 | -1/+1 |
| | | | |||||
* | | | Add latex support | Florian Orben | 2015-11-10 | 2 | -2/+12 |
|/ / | | | | | | | | | | | 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 |
| | | | |||||
* | | | Merge pull request #1377 from jdhoek/bug/spelling | Joram Wilander | 2015-11-10 | 2 | -9/+9 |
|\ \ \ | | | | | | | | | Spelling: replace 'Ex' with 'E.g.' in placeholders | ||||
| * | | | Spelling: replace 'Ex' with 'E.g.' in placeholders | Jeroen Hoek | 2015-11-10 | 2 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When abbreviating "For example" in English, "e.g." is used. See also: https://english.stackexchange.com/questions/16197/whats-the-difference-between-e-g-and-ex | ||||
* | | | | Add skip tutorial button to intro screens | JoramWilander | 2015-11-09 | 1 | -0/+12 |
|/ / / | |||||
* | | | Merge pull request #1350 from rgarmsen2295/plt-597 | Christopher Speller | 2015-11-09 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | PLT-597 Moves the 'Email verified' toast to above the sign-in prompt on the login screen | ||||
| * | | Moved 'Email verified' toast to above the sign-in prompt on the login screen | Reed Garmsen | 2015-11-06 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1367 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2015-11-09 | 3 | -4/+8 |
|\ \ | | | | | | | Updating tutorial tip and adding div tags to webhook labels. |