Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1426 from mattermost/plt-551 | Christopher Speller | 2015-11-16 | 1 | -82/+82 |
|\ | | | | | PLT-551 Fix cancel button on username setting and other general improvements | ||||
| * | Fix cancel button on username setting and other general improvements | JoramWilander | 2015-11-13 | 1 | -82/+82 |
| | | |||||
* | | Merge pull request #1424 from mattermost/plt-1113 | Christopher Speller | 2015-11-16 | 1 | -13/+14 |
|\ \ | | | | | | | PLT-1113 Tutorial tip dots are now clickable | ||||
| * | | Tutorial tip dots are now clickable | JoramWilander | 2015-11-13 | 1 | -13/+14 |
| |/ | |||||
* | | 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 | ||||
* | | | Fixing eslint error | Asaad Mahmood | 2015-11-13 | 1 | -1/+0 |
| | | | |||||
* | | | Multiple UI improvements | Asaad Mahmood | 2015-11-13 | 2 | -6/+3 |
|/ / | |||||
* | | Fixing bad merge | Christopher Speller | 2015-11-12 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'release-1.2' | Christopher Speller | 2015-11-12 | 5 | -6/+37 |
|\| | |||||
| * | Make import/export theme input box editable | JoramWilander | 2015-11-12 | 1 | -1/+0 |
| | | |||||
| * | Fix channel invite button on channel intro message and fix empty channel ↵ | JoramWilander | 2015-11-11 | 2 | -3/+11 |
| | | | | | | | | 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 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-1089 Fix profile not loading in RHS on refresh | ||||
| * | | Fix profile loading in RHS on refresh | JoramWilander | 2015-11-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1409 from mattermost/plt-961 | Corey Hulen | 2015-11-12 | 27 | -45/+46 |
|\ \ \ | | | | | | | | | 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 | 27 | -45/+46 |
| |/ / | | | | | | | | | | 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 | 4 | -20/+478 |
|\ \ | | | | | | | 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 | 2 | -1/+325 |
| | | | | | | | | | | | | eslintignore | ||||
| * | | PLT-1049: Vine URLs should not generate preview links | Florian Orben | 2015-11-10 | 3 | -20/+154 |
| | | | |||||
* | | | add button to preview your current post | Florian Orben | 2015-11-10 | 1 | -4/+38 |
|/ / | |||||
* | | 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. | ||||
| * | | Updating variable tipColor | Asaad Mahmood | 2015-11-09 | 1 | -1/+1 |
| | | | |||||
| * | | Updating tutorial tip | Asaad Mahmood | 2015-11-09 | 3 | -4/+8 |
| | | | |||||
* | | | Merge pull request #1366 from mattermost/jump-to-new | Christopher Speller | 2015-11-09 | 2 | -1/+14 |
|\ \ \ | |/ / |/| | | Jumps up to new messages indicator when new messages present | ||||
| * | | Jumps up to new messages indicator when new messages present | Christopher Speller | 2015-11-09 | 2 | -1/+14 |
| |/ | |||||
* / | Add new line break | JoramWilander | 2015-11-09 | 1 | -0/+1 |
|/ | |||||
* | Fixing jumping to bottom of channels when messages recieved in anouther channel | Christopher Speller | 2015-11-06 | 1 | -0/+2 |
| | |||||
* | Revert "Fixed loading forever on first page load" | Christopher Speller | 2015-11-06 | 1 | -0/+5 |
| | | | | This reverts commit d020db39cb3c694332b58f030c4441a761b16d01. |