summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | 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
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into PLT-589Stas Vovk2015-10-126-6/+21
| | |\ \ \ \ \
| * | | | | | | replaced constructions like user.roles === 'admin' by Utils.isAdmin(user.role...Stas Vovk2015-10-132-4/+4
| |/ / / / / /
| * | | | | | changed Admin to Team Admin in admin consoleStas Vovk2015-10-121-1/+3
| * | | | | | Merge remote-tracking branch 'upstream/master' into PLT-589Stas Vovk2015-10-1210-22/+20
| |\ \ \ \ \ \
| * | | | | | | changed Admin to Team Admin in Manage Team membersStas Vovk2015-10-121-1/+3
* | | | | | | | Merge pull request #1038 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-137-13/+40
|\ \ \ \ \ \ \ \
| * | | | | | | | Multiple Ui ImprovementsAsaad Mahmood2015-10-137-13/+40
* | | | | | | | | Merge pull request #968 from hmhealey/plt322Harrison Healey2015-10-1317-148/+1260
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Made further changes based on feedbackhmhealey2015-10-138-54/+56
| * | | | | | | | Removed Preference.AltIdhmhealey2015-10-1315-166/+246
| * | | | | | | | Made structural changes to server-side Preference code based on feedbackhmhealey2015-10-139-362/+227
| * | | | | | | | Rewrote PreferenceStore.SaveOrUpdate to work on Postgres within a transactionhmhealey2015-10-132-8/+57