summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1055 from florianorben/PLT-42Christopher Speller2015-10-152-0/+17
|\
| * PLT-42: Add "File uploading" text left of "Add Comment" when file is uploadingFlorian Orben2015-10-142-0/+17
* | Merge pull request #1065 from apaatsio/clarify-system-menuHarrison Healey2015-10-151-1/+5
|\ \
| * | Add titles to clarify icons in system consoleAntti Ahti2015-10-151-1/+5
* | | Merge pull request #1063 from mattermost/SMTP-updateCorey Hulen2015-10-151-45/+36
|\ \ \
| * | | Updated to use System Consoleit332015-10-141-45/+36
| |/ /
* | | Merge pull request #1058 from rgarmsen2295/plt-434Joram Wilander2015-10-151-20/+279
|\ \ \
| * | | Properly handle missing session IDs regardless of caseReed Garmsen2015-10-141-5/+9
| * | | Added all remaining audit descriptions to supported auditsReed Garmsen2015-10-141-47/+59
| * | | Added more individual audit handling, primarily involving the userReed Garmsen2015-10-141-5/+51
| * | | Added more supported audits to audit logReed Garmsen2015-10-141-73/+140
| * | | Finished structure for formatting audits and began writing individual formatt...Reed Garmsen2015-10-141-61/+132
| * | | Initial changes to audit log along with structure for handling different audi...Reed Garmsen2015-10-141-16/+75
| | |/ | |/|
* | | Update Production-Ubuntu.mdit332015-10-151-1/+1
* | | Updating /docs TOCit332015-10-141-1/+3
| |/ |/|
* | Merge pull request #1062 from mattermost/release-1.1.0Corey Hulen2015-10-141-1/+1
|\ \
| * | Fixing doc=Corey Hulen2015-10-141-1/+1
* | | Merge pull request #1053 from florianorben/markown_fixCorey Hulen2015-10-142-2/+2
|\ \ \
| * | | Don't auto-add http:// to mailto: and ftp: markdown linksFlorian Orben2015-10-142-2/+2
| | |/ | |/|
* | | Merge pull request #1061 from mattermost/release-1.1.0Corey Hulen2015-10-141-18/+23
|\ \ \ | | |/ | |/|
| * | Merge pull request #1056 from esethna/patch-7Corey Hulen2015-10-141-18/+23
| |\ \
| | * | Update SMTP instructionsesethna2015-10-141-18/+23
| |/ /
* | | Clarifying descriptionit332015-10-141-1/+1
* | | Update Slack-Import.mdit332015-10-141-1/+1
* | | Clarifying instructionit332015-10-141-1/+1
* | | Adjusting formattingit332015-10-141-1/+1
* | | Update Slack-Import.mdit332015-10-141-6/+11
* | | Update Slack-Import.mdit332015-10-141-8/+10
* | | Update Slack-Import.mdit332015-10-141-1/+1
| |/ |/|
* | Merge pull request #1047 from hmhealey/sidebarJoram Wilander2015-10-141-1/+1
|\ \
| * | Fixed overwritten CSS class in the sidebarhmhealey2015-10-141-1/+1
|/ /
* | Merge pull request #1046 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-10-1415-42/+74
|\ \
| * | Multiple UI ImprovementsAsaad Mahmood2015-10-1415-42/+74
* | | Merge release branch 'release-1.1.0'Christopher Speller2015-10-146-24/+70
|\ \ \ | |/ / |/| / | |/
| * Updating dockerfile for release v1.1.0-rc3Christopher Speller2015-10-141-1/+1
| * Merge pull request #1041 from mattermost/plt-603Christopher Speller2015-10-142-8/+40
| |\
| | * Fix webhook name not overriding in LHS and update webhook help text.JoramWilander2015-10-132-8/+40
| |/
| * Merge pull request #1040 from mattermost/plt-601Christopher Speller2015-10-131-10/+10
| |\
| | * Merge branch 'release-1.1.0' into plt-601Christopher Speller2015-10-132-5/+19
| | |\ | | |/ | |/|
| * | Merge pull request #1036 from mattermost/PLT-602Christopher Speller2015-10-132-5/+19
| |\ \
| | * | PLT-602 combining welcome and verify email=Corey Hulen2015-10-132-5/+19
| |/ /
| | * Fixing user settings dialog so it desn't ask you to check your email unless y...Christopher Speller2015-10-131-10/+10
| |/
* | Merge pull request #993 from apaatsio/bootstrap-help-blockChristopher Speller2015-10-145-9/+8
|\ \
| * | Use help-block class from BootstrapAntti Ahti2015-10-095-9/+8
* | | Update SMTP-Email-Setup.mdit332015-10-131-2/+2
* | | Merge pull request #1042 from hmhealey/plt322-followupJoram Wilander2015-10-133-6/+17
|\ \ \
| * | | Fixed leave direct channel button for users with a long usernamehmhealey2015-10-133-6/+17
* | | | Merge pull request #1017 from stasvovk/PLT-589Joram Wilander2015-10-132-4/+8
|\ \ \ \
| * \ \ \ Merge branch 'master' into PLT-589Stas Vovk2015-10-1327-102/+491
| |\ \ \ \
| * \ \ \ \ Merge branch 'PLT-589' of github.com:stasvovk/platform into PLT-589Stas Vovk2015-10-136-6/+21
| |\ \ \ \ \