summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* force reload on server update=Corey Hulen2015-11-172-2/+2
|
* Merge pull request #1438 from florianorben/PLT-924Christopher Speller2015-11-171-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 Orben2015-11-161-6/+11
| | | | | | | | (still edits as separate messages)
* | Merge pull request #1445 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-165-16/+13
|\ \ | | | | | | Multiple UI Improvements
| * | Removing height variableAsaad Mahmood2015-11-161-1/+0
| | |
| * | Multiple UI ImprovementsAsaad Mahmood2015-11-165-15/+13
| | |
* | | Merge pull request #1437 from rgarmsen2295/plt-1086Harrison Healey2015-11-163-65/+83
|\ \ \ | | | | | | | | PLT-1086 Enables the ability to rename the default channel (Town Square)
| * | | Allow admins to change the display name for the default channelReed Garmsen2015-11-133-65/+83
| | | |
* | | | Merge pull request #1433 from florianorben/PLT-862Corey Hulen2015-11-161-17/+21
|\ \ \ \ | |_|/ / |/| | | PLT-862: Show images from website links below messages
| * | | PLT-862: Show images from website links below messagesFlorian Orben2015-11-131-17/+21
| |/ /
* | | Merge pull request #1428 from mattermost/PLT-951Christopher Speller2015-11-161-1/+2
|\ \ \ | | | | | | | | PLT-951 updating help text
| * | | PLT-951 updating help text=Corey Hulen2015-11-131-1/+2
| | | |
* | | | Merge pull request #1426 from mattermost/plt-551Christopher Speller2015-11-161-82/+82
|\ \ \ \ | | | | | | | | | | PLT-551 Fix cancel button on username setting and other general improvements
| * | | | Fix cancel button on username setting and other general improvementsJoramWilander2015-11-131-82/+82
| | | | |
* | | | | Merge pull request #1424 from mattermost/plt-1113Christopher Speller2015-11-161-13/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | | PLT-1113 Tutorial tip dots are now clickable
| * | | | Tutorial tip dots are now clickableJoramWilander2015-11-131-13/+14
| |/ / /
* | | | Merge pull request #1431 from hmhealey/plt1149Joram Wilander2015-11-141-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 ↵hmhealey2015-11-131-5/+7
| | | | | | | | | | | | | | | | suggestions to show
* | | | Merge release branch 'release-1.2'Christopher Speller2015-11-132-2/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Added null check when accessing post texthmhealey2015-11-131-2/+3
| | | |
| * | | UI changes for Direct messages and Bad connectionAsaad Mahmood2015-11-131-0/+4
| | | |
* | | | Merge pull request #1422 from hmhealey/plt906Christopher Speller2015-11-131-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 ↵hmhealey2015-11-131-8/+14
| | | | | | | | | | | | | | | | prevent issues involving old data
* | | | Merge pull request #1415 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-132-7/+3
|\ \ \ \ | |_|_|/ |/| | | Multiple UI improvements
| * | | Fixing eslint errorAsaad Mahmood2015-11-131-1/+0
| | | |
| * | | Multiple UI improvementsAsaad Mahmood2015-11-132-6/+3
| |/ /
* | | Merge pull request #1419 from hmhealey/plt998Joram Wilander2015-11-131-18/+86
|\ \ \ | |/ / |/| | PLT-998/999/1100 Improving search term highlighting in results
| * | Improved highlighting of search flags to handle quotes and flagshmhealey2015-11-121-18/+86
| | |
* | | Fixing bad mergeChristopher Speller2015-11-121-1/+1
| | |
* | | Merge branch 'release-1.2'Christopher Speller2015-11-127-20/+46
|\ \ \ | | |/ | |/|
| * | Make import/export theme input box editableJoramWilander2015-11-121-1/+0
| | |
| * | Remove unneed roleJoramWilander2015-11-111-2/+0
| | |
| * | Remove unneed argumentJoramWilander2015-11-111-1/+1
| | |
| * | Fix channel invite button on channel intro message and fix empty channel ↵JoramWilander2015-11-114-18/+23
| | | | | | | | | | | | invite modal.
| * | Added text to the edit channel purpose menu option on mobilehmhealey2015-11-101-1/+3
| | |
| * | Updated post components to re-render after first receiving user profileshmhealey2015-11-091-1/+22
| | |
* | | Merge pull request #1412 from mattermost/plt-1089Corey Hulen2015-11-122-1/+5
|\ \ \ | | | | | | | | PLT-1089 Fix profile not loading in RHS on refresh
| * | | Fix profile loading in RHS on refreshJoramWilander2015-11-122-1/+5
| | |/ | |/|
* | | Merge pull request #1409 from mattermost/plt-961Corey Hulen2015-11-1228-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 ↵JoramWilander2015-11-1228-47/+138
| |/ / | | | | | | | | | accurate.
* | | Merge pull request #1407 from mattermost/plt-1041Corey Hulen2015-11-121-3/+5
|\ \ \ | | | | | | | | PLT-1041 Fix multiple pending/errored posts
| * | | Fix multiple pending/errored postsJoramWilander2015-11-121-3/+5
| |/ /
* | | Merge pull request #1411 from hmhealey/plt876Christopher Speller2015-11-121-0/+2
|\ \ \ | | | | | | | | PLT-876 Sorted channel list before rendering them in the sidebar
| * | | Sorted channel list before rendering them in the sidebarhmhealey2015-11-121-0/+2
| |/ /
* | | Merge pull request #1410 from hmhealey/plt906Christopher Speller2015-11-122-3/+7
|\ \ \ | | | | | | | | PLT-906 Added ChannelExtra.MemberCount field
| * | | Added ChannelExtra.MemberCount field to reflect the actual member count when ↵hmhealey2015-11-122-3/+7
| |/ / | | | | | | | | | we truncate the list of members to 20
* | | Merge pull request #1408 from hmhealey/plt922Christopher Speller2015-11-121-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 ↵hmhealey2015-11-121-15/+29
| |/ / | | | | | | | | | currently being sent
* | | Updating profile image and textbox resizingAsaad Mahmood2015-11-121-3/+2
| | |
* | | UI Improvements for centre channel due to previewAsaad Mahmood2015-11-121-1/+1
|/ /