Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1450 from mattermost/Upgrade-Update | it33 | 2015-11-16 | 1 | -3/+5 |
|\ | | | | | Update Upgrade-Guide.md | ||||
| * | Update Upgrade-Guide.md | it33 | 2015-11-16 | 1 | -3/+5 |
|/ | |||||
* | Merge pull request #1446 from mattermost/webhooks-disabled | it33 | 2015-11-16 | 1 | -3/+27 |
|\ | | | | | Updating given webhooks off by default | ||||
| * | Update Administration.md | it33 | 2015-11-16 | 1 | -1/+1 |
| | | |||||
| * | Update Administration.md | it33 | 2015-11-16 | 1 | -8/+6 |
| | | |||||
| * | Updating given webhooks off by default | it33 | 2015-11-16 | 1 | -2/+28 |
| | | |||||
* | | Merge pull request #1449 from mattermost/PLT-901 | Corey Hulen | 2015-11-16 | 1 | -3/+2 |
|\ \ | | | | | | | PLT-901 partial fix for iOS, adding device type | ||||
| * | | Adding device type | =Corey Hulen | 2015-11-16 | 1 | -3/+2 |
|/ / | |||||
* | | Merge pull request #1445 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-11-16 | 15 | -67/+112 |
|\ \ | |/ |/| | Multiple UI Improvements | ||||
| * | Removing height variable | Asaad Mahmood | 2015-11-16 | 1 | -1/+0 |
| | | |||||
| * | Updating timestamp in RHS | Asaad Mahmood | 2015-11-16 | 2 | -6/+15 |
| | | |||||
| * | Multiple UI Improvements | Asaad Mahmood | 2015-11-16 | 15 | -64/+101 |
| | | |||||
* | | Merge pull request #1437 from rgarmsen2295/plt-1086 | Harrison Healey | 2015-11-16 | 6 | -69/+94 |
|\ \ | | | | | | | PLT-1086 Enables the ability to rename the default channel (Town Square) | ||||
| * | | Fixed unit test issues | Reed Garmsen | 2015-11-13 | 2 | -2/+3 |
| | | | |||||
| * | | Allow admins to change the display name for the default channel | Reed Garmsen | 2015-11-13 | 5 | -68/+92 |
| | | | |||||
* | | | Merge release branch 'release-1.2' | Christopher Speller | 2015-11-16 | 10 | -14/+21 |
|\ \ \ | |||||
| * | | | Updating version to 1.2.1 | Christopher Speller | 2015-11-16 | 2 | -1/+2 |
| | | | | |||||
| * | | | Merge pull request #1443 from mattermost/lfbrock-patch-2 | Christopher Speller | 2015-11-16 | 2 | -4/+2 |
| |\ \ \ | | | | | | | | | | | Update CHANGELOG.md | ||||
| | * | | | Update Outgoing-Webhooks.md | lfbrock | 2015-11-16 | 1 | -3/+1 |
| | | | | | |||||
| | * | | | Update CHANGELOG.md | lfbrock | 2015-11-16 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #1440 from mattermost/out-hook-fix | Joram Wilander | 2015-11-16 | 5 | -8/+16 |
| |\ \ \ | | | | | | | | | | | Fixing outgoing hook | ||||
| | * | | | adding skip | =Corey Hulen | 2015-11-15 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | Merge branch 'out-hook-fix' of https://github.com/mattermost/platform into ↵ | =Corey Hulen | 2015-11-15 | 0 | -0/+0 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | out-hook-fix | ||||
| | | * | | | Fixing outgoing hook | =Corey Hulen | 2015-11-15 | 5 | -8/+12 |
| | | | | | | |||||
| | * | | | | Fixing outgoing hook | =Corey Hulen | 2015-11-15 | 5 | -8/+12 |
| |/ / / / | |||||
| * | | | | Merge pull request #1436 from florianorben/1432.v1.2 | Christopher Speller | 2015-11-15 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | allow incoming webhooks even if it doesnt have a text on it if attachment field is present | ||||
| | * | | | allow incoming webhooks even if it doesnt have a text on it if attachment ↵ | Florian Orben | 2015-11-14 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | field is present | ||||
* | | | | Merge pull request #1433 from florianorben/PLT-862 | Corey Hulen | 2015-11-16 | 4 | -23/+34 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-862: Show images from website links below messages | ||||
| * | | | add a unit test to textgeneration.go | Florian Orben | 2015-11-14 | 1 | -4/+11 |
| | | | | |||||
| * | | | PLT-862: Show images from website links below messages | Florian Orben | 2015-11-13 | 3 | -19/+23 |
| | |/ | |/| | |||||
* | | | Merge pull request #1428 from mattermost/PLT-951 | Christopher Speller | 2015-11-16 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | PLT-951 updating help text | ||||
| * | | | PLT-951 updating help text | =Corey Hulen | 2015-11-13 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #1426 from mattermost/plt-551 | Christopher Speller | 2015-11-16 | 2 | -83/+83 |
|\ \ \ \ | | | | | | | | | | | PLT-551 Fix cancel button on username setting and other general improvements | ||||
| * | | | | Fix cancel button on username setting and other general improvements | JoramWilander | 2015-11-13 | 2 | -83/+83 |
| | | | | | |||||
* | | | | | Merge pull request #1424 from mattermost/plt-1113 | Christopher Speller | 2015-11-16 | 1 | -13/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1113 Tutorial tip dots are now clickable | ||||
| * | | | | | Tutorial tip dots are now clickable | JoramWilander | 2015-11-13 | 1 | -13/+14 |
| |/ / / / | |||||
* | | | | | Merge pull request #1431 from hmhealey/plt1149 | Joram Wilander | 2015-11-14 | 1 | -5/+7 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-1149 Fixed some console errors related to the search autocomplete | ||||
| * | | | | Fixed some console errors with the search autocomplete when there are no ↵ | hmhealey | 2015-11-13 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | suggestions to show | ||||
* | | | | | Merge release branch 'release-1.2' | Christopher Speller | 2015-11-13 | 5 | -5/+11 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Updating dockerfile for release v1.2.0 | Christopher Speller | 2015-11-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update Changelog | Christopher Speller | 2015-11-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #1427 from hmhealey/attachmentnullfix-1.2 | Christopher Speller | 2015-11-13 | 1 | -2/+3 |
| |\ \ \ | | | | | | | | | | | (1.2) Added null check when accessing post text | ||||
| | * | | | Added null check when accessing post text | hmhealey | 2015-11-13 | 1 | -2/+3 |
| |/ / / | |||||
| * | | | Merge pull request #1420 from asaadmahmoodspin/release-1.2 | Christopher Speller | 2015-11-13 | 2 | -1/+6 |
| |\ \ \ | | | | | | | | | | | UI changes for Direct messages and Bad connection | ||||
| | * | | | Updating bad connection css | Asaad Mahmood | 2015-11-13 | 2 | -2/+3 |
| | | | | | |||||
| | * | | | UI changes for Direct messages and Bad connection | Asaad Mahmood | 2015-11-13 | 2 | -1/+5 |
| |/ / / | |||||
* | | | | Merge pull request #1422 from hmhealey/plt906 | Christopher Speller | 2015-11-13 | 1 | -8/+14 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-906 Improved client-side handling when ExtraInfo.MemberCount may not be set | ||||
| * | | | Made code for the member popover count a bit more robust to hopefully ↵ | hmhealey | 2015-11-13 | 1 | -8/+14 |
| | | | | | | | | | | | | | | | | prevent issues involving old data | ||||
* | | | | Merge pull request #1415 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-11-13 | 6 | -20/+29 |
|\ \ \ \ | |_|_|/ |/| | | | Multiple UI improvements | ||||
| * | | | Small fix for time in RHS | Asaad Mahmood | 2015-11-13 | 1 | -3/+9 |
| | | | |