Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Added Modal base class that extends ReactBootstrap.Modal | hmhealey | 2015-11-17 | 5 | -20/+59 | |
| | | ||||||
* | | Merge pull request #1455 from alexgaribay/PLT-866 | Joram Wilander | 2015-11-18 | 1 | -9/+7 | |
|\ \ | | | | | | | PLT-866: Update text on sign-in page | |||||
| * | | PLT-866: Update text on sign-in page | Alex Garibay | 2015-11-17 | 1 | -9/+7 | |
| | | | ||||||
* | | | Merge pull request #1403 from florianorben/PLT-327 | Corey Hulen | 2015-11-17 | 3 | -1/+71 | |
|\ \ \ | |/ / |/| | | PLT-327: Add help text for Markdown | |||||
| * | | PLT-327: Add help text for Markdown | Florian Orben | 2015-11-17 | 3 | -1/+71 | |
| |/ | ||||||
* / | force reload on server update | =Corey Hulen | 2015-11-17 | 2 | -2/+2 | |
|/ | ||||||
* | Merge pull request #1438 from florianorben/PLT-924 | Christopher Speller | 2015-11-17 | 1 | -6/+11 | |
|\ | | | | | PLT-924: Combine sequential messages from same user to look like one … | |||||
| * | 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 #1445 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-11-16 | 5 | -16/+13 | |
|\ \ | | | | | | | Multiple UI Improvements | |||||
| * | | Removing height variable | Asaad Mahmood | 2015-11-16 | 1 | -1/+0 | |
| | | | ||||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2015-11-16 | 5 | -15/+13 | |
| | | | ||||||
* | | | Merge pull request #1437 from rgarmsen2295/plt-1086 | Harrison Healey | 2015-11-16 | 3 | -65/+83 | |
|\ \ \ | | | | | | | | | PLT-1086 Enables the ability to rename the default channel (Town Square) | |||||
| * | | | Allow admins to change the display name for the default channel | Reed Garmsen | 2015-11-13 | 3 | -65/+83 | |
| | | | | ||||||
* | | | | Merge pull request #1433 from florianorben/PLT-862 | Corey Hulen | 2015-11-16 | 1 | -17/+21 | |
|\ \ \ \ | |_|/ / |/| | | | PLT-862: Show images from website links below messages | |||||
| * | | | PLT-862: Show images from website links below messages | Florian Orben | 2015-11-13 | 1 | -17/+21 | |
| |/ / | ||||||
* | | | Merge pull request #1428 from mattermost/PLT-951 | Christopher Speller | 2015-11-16 | 1 | -1/+2 | |
|\ \ \ | | | | | | | | | PLT-951 updating help text | |||||
| * | | | PLT-951 updating help text | =Corey Hulen | 2015-11-13 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | 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 | |||||
* | | | | 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 |