summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1115 from mattermost/salt-fixChristopher Speller2015-10-201-8/+8
|\
| * Allowing salts longer than 32 chars=Corey Hulen2015-10-191-8/+8
* | Merge pull request #1119 from mattermost/fix-db-upgradeHarrison Healey2015-10-203-1/+19
|\ \ | |/ |/|
| * Hotfix to allow .7 to be upgraded to 1.1=Corey Hulen2015-10-203-1/+19
|/
* Fixing doc=Corey Hulen2015-10-141-1/+1
* Merge pull request #1056 from esethna/patch-7Corey Hulen2015-10-141-18/+23
|\
| * Update SMTP instructionsesethna2015-10-141-18/+23
|/
* 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
|/
* Updating dockerfile for release v1.1.0-rc2Christopher Speller2015-10-131-1/+1
* Merge pull request #1025 from mattermost/PLT-596Christopher Speller2015-10-131-1/+1
|\
| * PLT-596 - Update to email verification titleit332015-10-121-1/+1
|/
* Merge pull request #1023 from mattermost/fix-configCorey Hulen2015-10-121-111/+96
|\
| * Fixing document=Corey Hulen2015-10-121-111/+96
|/
* Merge pull request #997 from mattermost/PLT-586Corey Hulen2015-10-1214-76/+135
|\
| * Merge branch 'release-1.1.0' into PLT-586=Corey Hulen2015-10-121-1/+1
| |\ | |/ |/|
* | Merge pull request #999 from rgarmsen2295/plt-610Corey Hulen2015-10-121-1/+1
|\ \
| * | Replaced change email verification email logo image with a static linkReed Garmsen2015-10-091-1/+1
| | * Merge branch 'release-1.1.0' into PLT-586=Corey Hulen2015-10-121-0/+317
| | |\ | |_|/ |/| |
* | | Merge pull request #1020 from mattermost/config-fixCorey Hulen2015-10-121-0/+317
|\ \ \
| * | | Adding new config documentation=Corey Hulen2015-10-121-0/+317
|/ / /
| | * Fixing break=Corey Hulen2015-10-121-2/+0
| | * Removing offical build check=Corey Hulen2015-10-122-2/+2
| | * Merge branch 'release-1.1.0' into PLT-586=Corey Hulen2015-10-122-2/+2
| | |\ | |_|/ |/| |
* | | Merge pull request #1001 from mattermost/missed-prit332015-10-112-2/+2
|\ \ \ | |/ / |/| |
| * | Update manage_incoming_hooks.jsxit332015-10-091-1/+1
| * | Update user_settings_integrations.jsxit332015-10-091-1/+1
| * | Update manage_incoming_hooks.jsxit332015-10-091-1/+1
|/ /
| * PLT-586 fixing issues with security alert=Corey Hulen2015-10-0914-74/+135
|/
* Fixing broken travis release buildChristopher Speller2015-10-082-3/+14
* Adding release 1.1.0 versionChristopher Speller2015-10-081-0/+1
* Creating dockerfiles for release 1.1.0Christopher Speller2015-10-088-105/+94
* Merge pull request #984 from hmhealey/linkfixCorey Hulen2015-10-081-1/+1
|\
| * Fixed html used for autolinkinghmhealey2015-10-081-1/+1
|/
* Merge pull request #983 from mattermost/fix-db-upgradeHarrison Healey2015-10-084-9/+3
|\
| * Fixing db upgrade for 1.1=Corey Hulen2015-10-084-9/+3
* | Merge pull request #977 from mattermost/lfbrock-patch-1Corey Hulen2015-10-081-0/+64
|\ \ | |/ |/|
| * Update CHANGELOG.mdlfbrock2015-10-081-0/+1
| * Update to include v1.1.0lfbrock2015-10-081-0/+63
* | Renaming SpinPunch, Inc. to Mattermost, Inc.it332015-10-081-2/+2
* | Merge pull request #982 from hmhealey/plt547Harrison Healey2015-10-081-24/+24
|\ \
| * | Fixed parsing of :'( emoticonhmhealey2015-10-081-1/+1
| * | Changed emoticons so that they much be surrounded by whitespacehmhealey2015-10-081-24/+24
| * | Switched :p emoticonhmhealey2015-10-081-1/+1
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-01 08:48:43 +0000