summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Removed Modal base classhmhealey2015-11-178-59/+37
|
* Converted DeleteChannelModal to React-Bootstraphmhealey2015-11-174-93/+53
|
* Converted ChannelNotificationsModal to React-Bootstraphmhealey2015-11-174-91/+49
|
* Converted ChannelInfoModal to React-Bootstraphmhealey2015-11-174-89/+53
|
* Renamed onModalDismissed to onHide to keep it consistent with React-Bootstraphmhealey2015-11-173-18/+19
|
* Added ToggleModalButton componenthmhealey2015-11-172-39/+71
|
* Added Modal base class that extends ReactBootstrap.Modalhmhealey2015-11-175-20/+59
|
* Merge pull request #1438 from florianorben/PLT-924Christopher Speller2015-11-173-56/+101
|\ | | | | 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-163-56/+101
| | | | | | | | (still edits as separate messages)
* | Merge pull request #1445 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-1615-67/+112
|\ \ | | | | | | Multiple UI Improvements
| * | Removing height variableAsaad Mahmood2015-11-161-1/+0
| | |
| * | Updating timestamp in RHSAsaad Mahmood2015-11-162-6/+15
| | |
| * | Multiple UI ImprovementsAsaad Mahmood2015-11-1615-64/+101
| | |
* | | Merge pull request #1437 from rgarmsen2295/plt-1086Harrison Healey2015-11-164-65/+87
|\ \ \ | | | | | | | | PLT-1086 Enables the ability to rename the default channel (Town Square)
| * | | Fixed unit test issuesReed Garmsen2015-11-131-1/+1
| | | |
| * | | Allow admins to change the display name for the default channelReed Garmsen2015-11-134-65/+87
| | | |
* | | | Merge release branch 'release-1.2'Christopher Speller2015-11-161-1/+1
|\ \ \ \
| * | | | allow incoming webhooks even if it doesnt have a text on it if attachment ↵Florian Orben2015-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | field is present
* | | | | Merge pull request #1433 from florianorben/PLT-862Corey Hulen2015-11-163-19/+23
|\ \ \ \ \ | |_|_|/ / |/| | | | PLT-862: Show images from website links below messages
| * | | | PLT-862: Show images from website links below messagesFlorian Orben2015-11-133-19/+23
| | |/ / | |/| |
* | | | 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-133-3/+9
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Added null check when accessing post texthmhealey2015-11-131-2/+3
| | | |
| * | | Updating bad connection cssAsaad Mahmood2015-11-131-1/+2
| | | |
| * | | 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-136-20/+29
|\ \ \ \ | |_|_|/ |/| | | Multiple UI improvements
| * | | Small fix for time in RHSAsaad Mahmood2015-11-131-3/+9
| | | |
| * | | Updating post.scss due to merge issuesAsaad Mahmood2015-11-131-4/+7
| | | |
| * | | Updating post.scssAsaad Mahmood2015-11-131-75/+91
| | | |
| * | | Fixing eslint errorAsaad Mahmood2015-11-131-1/+0
| | | |
| * | | Multiple UI improvementsAsaad Mahmood2015-11-136-113/+98
| |/ /
* | | 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
| | |
* | | Merge pull request #1417 from florianorben/PLT-1141Christopher Speller2015-11-131-0/+1
|\ \ \ | | | | | | | | PLT-1141: Page previews can overflow their boundaries
| * | | PLT-1141: Page previews can overflow their boundariesFlorian Orben2015-11-121-0/+1
| | | |
* | | | Fixing bad mergeChristopher Speller2015-11-121-1/+1
| | | |
* | | | Merge branch 'release-1.2'Christopher Speller2015-11-128-22/+48
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Adding safari 8 to list of unsupported browsers.Christopher Speller2015-11-121-2/+2
| | |
| * | 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
| | |