summaryrefslogtreecommitdiffstats
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 #1452 from cifvts/patch-1Christopher Speller2015-11-171-1/+1
|\ \ | | | | | | Fix Mattermost version in download link
| * | Fix Mattermost version in download linkAndrea Agosti2015-11-171-1/+1
|/ /
* | Merge pull request #1450 from mattermost/Upgrade-Updateit332015-11-161-3/+5
|\ \ | | | | | | Update Upgrade-Guide.md
| * | Update Upgrade-Guide.mdit332015-11-161-3/+5
|/ /
* | Merge pull request #1446 from mattermost/webhooks-disabledit332015-11-161-3/+27
|\ \ | | | | | | Updating given webhooks off by default
| * | Update Administration.mdit332015-11-161-1/+1
| | |
| * | Update Administration.mdit332015-11-161-8/+6
| | |
| * | Updating given webhooks off by defaultit332015-11-161-2/+28
| | |
* | | Merge pull request #1449 from mattermost/PLT-901Corey Hulen2015-11-161-3/+2
|\ \ \ | | | | | | | | PLT-901 partial fix for iOS, adding device type
| * | | Adding device type=Corey Hulen2015-11-161-3/+2
|/ / /
* | | 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-166-69/+94
|\ \ \ | | | | | | | | PLT-1086 Enables the ability to rename the default channel (Town Square)
| * | | Fixed unit test issuesReed Garmsen2015-11-132-2/+3
| | | |
| * | | Allow admins to change the display name for the default channelReed Garmsen2015-11-135-68/+92
| | | |
* | | | Merge release branch 'release-1.2'Christopher Speller2015-11-1610-14/+21
|\ \ \ \
| * | | | Updating version to 1.2.1Christopher Speller2015-11-162-1/+2
| | | | |
| * | | | Merge pull request #1443 from mattermost/lfbrock-patch-2Christopher Speller2015-11-162-4/+2
| |\ \ \ \ | | | | | | | | | | | | Update CHANGELOG.md
| | * | | | Update Outgoing-Webhooks.mdlfbrock2015-11-161-3/+1
| | | | | |
| | * | | | Update CHANGELOG.mdlfbrock2015-11-161-1/+1
| |/ / / /
| * | | | Merge pull request #1440 from mattermost/out-hook-fixJoram Wilander2015-11-165-8/+16
| |\ \ \ \ | | | | | | | | | | | | Fixing outgoing hook
| | * | | | adding skip=Corey Hulen2015-11-151-0/+4
| | | | | |
| | * | | | Merge branch 'out-hook-fix' of https://github.com/mattermost/platform into ↵=Corey Hulen2015-11-150-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | out-hook-fix
| | | * | | | Fixing outgoing hook=Corey Hulen2015-11-155-8/+12
| | | | | | |
| | * | | | | Fixing outgoing hook=Corey Hulen2015-11-155-8/+12
| |/ / / / /
| * | | | | Merge pull request #1436 from florianorben/1432.v1.2Christopher Speller2015-11-151-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | allow incoming webhooks even if it doesnt have a text on it if attachment field is present
| | * | | | 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-164-23/+34
|\ \ \ \ \ | |_|_|/ / |/| | | | PLT-862: Show images from website links below messages
| * | | | add a unit test to textgeneration.goFlorian Orben2015-11-141-4/+11
| | | | |
| * | | | 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-162-83/+83
|\ \ \ \ \ | | | | | | | | | | | | PLT-551 Fix cancel button on username setting and other general improvements
| * | | | | Fix cancel button on username setting and other general improvementsJoramWilander2015-11-132-83/+83
| | | | | |
* | | | | | 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-135-5/+11
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |