summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added search button to mobile navbarhmhealey2015-11-183-3/+36
|
* Added ability to open search sidebar programaticallyhmhealey2015-11-183-7/+42
|
* Merge pull request #1423 from hmhealey/plt737Christopher Speller2015-11-1811-322/+254
|\ | | | | PLT-737 Converted first set of Modals to ReactBootstrap
| * 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 #1456 from alexgaribay/PLT-873Joram Wilander2015-11-181-1/+1
|\ \ | | | | | | PLT-873: Change email invitation subject
| * | PLT-873: Change email invitation subjectAlex Garibay2015-11-171-1/+1
| | |
* | | Merge pull request #1455 from alexgaribay/PLT-866Joram Wilander2015-11-181-9/+7
|\ \ \ | | | | | | | | PLT-866: Update text on sign-in page
| * | | PLT-866: Update text on sign-in pageAlex Garibay2015-11-171-9/+7
| |/ /
* | | Merge pull request #1453 from esethna/patch-13Corey Hulen2015-11-171-1/+1
|\ \ \ | | | | | | | | Update Upgrade-Guide.md
| * | | Update Upgrade-Guide.mdEric Sethna2015-11-171-1/+1
| | |/ | |/| | | | Add a browser refresh to the last step.
* | | Merge pull request #1451 from mattermost/changelog-updateCorey Hulen2015-11-171-5/+17
|\ \ \ | | | | | | | | Update CHANGELOG.md
| * | | Update CHANGELOG.mdit332015-11-161-5/+17
| | | |
* | | | Merge pull request #1403 from florianorben/PLT-327Corey Hulen2015-11-177-14/+125
|\ \ \ \ | |_|_|/ |/| | | PLT-327: Add help text for Markdown
| * | | PLT-327: Add help text for MarkdownFlorian Orben2015-11-177-14/+125
| | |/ | |/|
* | | Merge pull request #1454 from mattermost/force-reloadChristopher Speller2015-11-172-2/+2
|\ \ \ | |/ / |/| | force reload on server update
| * | force reload on server update=Corey Hulen2015-11-172-2/+2
|/ /
* | 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
| | | | | | |