summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 title
| * 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
| * Fixing document=Corey Hulen2015-10-121-111/+96
|/
* Merge pull request #997 from mattermost/PLT-586Corey Hulen2015-10-1214-76/+135
|\ | | | | PLT-586 fixing issues with security alert
| * 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
|\ \ | | | | | | PLT-610 Fix broken image in change email verification email
| * | 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
| * | | 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
|\ \ \ | |/ / |/| | Missed PR - Help text update to webhooks
| * | 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 autolinking
| * 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
| * 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
|\ \ | |/ |/| Updated to include v1.1.0
| * 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
|\ \ | | | | | | PLT-547 Changed emoticons so that they must be surrounded by whitespace
| * | 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
| | |
* | | Merge pull request #981 from mattermost/plt-517Christopher Speller2015-10-08303-303/+303
|\ \ \ | | | | | | | | PLT-517 Changing SpinPunch to Mattermost in copyright
| * | | Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-08303-303/+303
| |/ /
* | | Merge pull request #978 from mattermost/plt-355Corey Hulen2015-10-085-114/+111
|\ \ \ | | | | | | | | PLT-355 Fixing ability to dynamicly update members list.
| * | | Fixing ability to dynamicly update members list.Christopher Speller2015-10-085-114/+111
| | | |
* | | | Merge pull request #971 from mattermost/PLT-567Corey Hulen2015-10-083-6/+30
|\ \ \ \ | | | | | | | | | | PLT-567 auto join open channels
| * | | | Fixing issue with lastIndexOf=Corey Hulen2015-10-082-2/+2
| | | | |
| * | | | Adding removing blank target for browser links=Corey Hulen2015-10-082-2/+7
| | | | |
| * | | | PLT-567 auto join open channels=Corey Hulen2015-10-072-5/+24
| |/ / /
* | | | Merge pull request #979 from mattermost/it33-patch-1Corey Hulen2015-10-081-6/+2
|\ \ \ \ | |_|/ / |/| | | Removing unneeded <br> in welcome text
| * | | Tweaking welcome text in Town-Squareit332015-10-081-6/+2
|/ / /
* | | Merge pull request #966 from mattermost/GIT-960Christopher Speller2015-10-083-11/+17
|\ \ \ | | | | | | | | GIT-960 show error when you cannot create a team
| * | | GIT-960 show error when you cannot create a team=Corey Hulen2015-10-073-11/+17
| |/ /
* | | Merge pull request #944 from mattermost/PLT-518Christopher Speller2015-10-0811-59/+198
|\ \ \ | | | | | | | | PLT-518 check for security bulletins
| * | | Moving to url.Values=Corey Hulen2015-10-071-11/+3
| | | |
| * | | Moving to url.Values=Corey Hulen2015-10-071-1/+1
| | | |