Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #997 from mattermost/PLT-586 | Corey Hulen | 2015-10-12 | 14 | -76/+135 |
|\ | | | | | PLT-586 fixing issues with security alert | ||||
| * | Merge branch 'release-1.1.0' into PLT-586 | =Corey Hulen | 2015-10-12 | 1 | -1/+1 |
| |\ | |/ |/| | |||||
* | | Merge pull request #999 from rgarmsen2295/plt-610 | Corey Hulen | 2015-10-12 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-610 Fix broken image in change email verification email | ||||
| * | | Replaced change email verification email logo image with a static link | Reed Garmsen | 2015-10-09 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'release-1.1.0' into PLT-586 | =Corey Hulen | 2015-10-12 | 1 | -0/+317 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #1020 from mattermost/config-fix | Corey Hulen | 2015-10-12 | 1 | -0/+317 |
|\ \ \ | | | | | | | | | Adding new config documentation | ||||
| * | | | Adding new config documentation | =Corey Hulen | 2015-10-12 | 1 | -0/+317 |
|/ / / | |||||
| | * | Fixing break | =Corey Hulen | 2015-10-12 | 1 | -2/+0 |
| | | | |||||
| | * | Removing offical build check | =Corey Hulen | 2015-10-12 | 2 | -2/+2 |
| | | | |||||
| | * | Merge branch 'release-1.1.0' into PLT-586 | =Corey Hulen | 2015-10-12 | 2 | -2/+2 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #1001 from mattermost/missed-pr | it33 | 2015-10-11 | 2 | -2/+2 |
|\ \ \ | |/ / |/| | | Missed PR - Help text update to webhooks | ||||
| * | | Update manage_incoming_hooks.jsx | it33 | 2015-10-09 | 1 | -1/+1 |
| | | | |||||
| * | | Update user_settings_integrations.jsx | it33 | 2015-10-09 | 1 | -1/+1 |
| | | | |||||
| * | | Update manage_incoming_hooks.jsx | it33 | 2015-10-09 | 1 | -1/+1 |
|/ / | |||||
| * | PLT-586 fixing issues with security alert | =Corey Hulen | 2015-10-09 | 14 | -74/+135 |
|/ | |||||
* | Fixing broken travis release build | Christopher Speller | 2015-10-08 | 2 | -3/+14 |
| | |||||
* | Adding release 1.1.0 version | Christopher Speller | 2015-10-08 | 1 | -0/+1 |
| | |||||
* | Creating dockerfiles for release 1.1.0 | Christopher Speller | 2015-10-08 | 8 | -105/+94 |
| | |||||
* | Merge pull request #984 from hmhealey/linkfix | Corey Hulen | 2015-10-08 | 1 | -1/+1 |
|\ | | | | | Fixed html used for autolinking | ||||
| * | Fixed html used for autolinking | hmhealey | 2015-10-08 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #983 from mattermost/fix-db-upgrade | Harrison Healey | 2015-10-08 | 4 | -9/+3 |
|\ | | | | | Fixing db upgrade for 1.1 | ||||
| * | Fixing db upgrade for 1.1 | =Corey Hulen | 2015-10-08 | 4 | -9/+3 |
| | | |||||
* | | Merge pull request #977 from mattermost/lfbrock-patch-1 | Corey Hulen | 2015-10-08 | 1 | -0/+64 |
|\ \ | |/ |/| | Updated to include v1.1.0 | ||||
| * | Update CHANGELOG.md | lfbrock | 2015-10-08 | 1 | -0/+1 |
| | | |||||
| * | Update to include v1.1.0 | lfbrock | 2015-10-08 | 1 | -0/+63 |
| | | |||||
* | | Renaming SpinPunch, Inc. to Mattermost, Inc. | it33 | 2015-10-08 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #982 from hmhealey/plt547 | Harrison Healey | 2015-10-08 | 1 | -24/+24 |
|\ \ | | | | | | | PLT-547 Changed emoticons so that they must be surrounded by whitespace | ||||
| * | | Fixed parsing of :'( emoticon | hmhealey | 2015-10-08 | 1 | -1/+1 |
| | | | |||||
| * | | Changed emoticons so that they much be surrounded by whitespace | hmhealey | 2015-10-08 | 1 | -24/+24 |
| | | | |||||
| * | | Switched :p emoticon | hmhealey | 2015-10-08 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #981 from mattermost/plt-517 | Christopher Speller | 2015-10-08 | 303 | -303/+303 |
|\ \ \ | | | | | | | | | PLT-517 Changing SpinPunch to Mattermost in copyright | ||||
| * | | | Changing SpinPunch to Mattermost in copyright | Christopher Speller | 2015-10-08 | 303 | -303/+303 |
| |/ / | |||||
* | | | Merge pull request #978 from mattermost/plt-355 | Corey Hulen | 2015-10-08 | 5 | -114/+111 |
|\ \ \ | | | | | | | | | PLT-355 Fixing ability to dynamicly update members list. | ||||
| * | | | Fixing ability to dynamicly update members list. | Christopher Speller | 2015-10-08 | 5 | -114/+111 |
| | | | | |||||
* | | | | Merge pull request #971 from mattermost/PLT-567 | Corey Hulen | 2015-10-08 | 3 | -6/+30 |
|\ \ \ \ | | | | | | | | | | | PLT-567 auto join open channels | ||||
| * | | | | Fixing issue with lastIndexOf | =Corey Hulen | 2015-10-08 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Adding removing blank target for browser links | =Corey Hulen | 2015-10-08 | 2 | -2/+7 |
| | | | | | |||||
| * | | | | PLT-567 auto join open channels | =Corey Hulen | 2015-10-07 | 2 | -5/+24 |
| |/ / / | |||||
* | | | | Merge pull request #979 from mattermost/it33-patch-1 | Corey Hulen | 2015-10-08 | 1 | -6/+2 |
|\ \ \ \ | |_|/ / |/| | | | Removing unneeded <br> in welcome text | ||||
| * | | | Tweaking welcome text in Town-Square | it33 | 2015-10-08 | 1 | -6/+2 |
|/ / / | |||||
* | | | Merge pull request #966 from mattermost/GIT-960 | Christopher Speller | 2015-10-08 | 3 | -11/+17 |
|\ \ \ | | | | | | | | | GIT-960 show error when you cannot create a team | ||||
| * | | | GIT-960 show error when you cannot create a team | =Corey Hulen | 2015-10-07 | 3 | -11/+17 |
| |/ / | |||||
* | | | Merge pull request #944 from mattermost/PLT-518 | Christopher Speller | 2015-10-08 | 11 | -59/+198 |
|\ \ \ | | | | | | | | | PLT-518 check for security bulletins | ||||
| * | | | Moving to url.Values | =Corey Hulen | 2015-10-07 | 1 | -11/+3 |
| | | | | |||||
| * | | | Moving to url.Values | =Corey Hulen | 2015-10-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Changing to url values | =Corey Hulen | 2015-10-07 | 2 | -17/+9 |
| | | | | |||||
| * | | | PLT-518 check for security bulletins | =Corey Hulen | 2015-10-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | PLT-518 check for security bulletins | =Corey Hulen | 2015-10-05 | 11 | -48/+203 |
| | | | | |||||
* | | | | Merge pull request #931 from rgarmsen2295/plt-112 | Christopher Speller | 2015-10-08 | 9 | -15/+157 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-112 Improves email change verification process | ||||
| * | | | Added new email to email change notification | Reed Garmsen | 2015-10-06 | 3 | -26/+19 |
| | | | |