Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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 | |
| | | | | ||||||
| * | | | Updating post.scss due to merge issues | Asaad Mahmood | 2015-11-13 | 1 | -4/+7 | |
| | | | | ||||||
| * | | | Updating post.scss | Asaad Mahmood | 2015-11-13 | 1 | -75/+91 | |
| | | | | ||||||
| * | | | Fixing eslint error | Asaad Mahmood | 2015-11-13 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Multiple UI improvements | Asaad Mahmood | 2015-11-13 | 6 | -113/+98 | |
| |/ / | ||||||
* | | | Merge pull request #1419 from hmhealey/plt998 | Joram Wilander | 2015-11-13 | 1 | -18/+86 | |
|\ \ \ | |/ / |/| | | PLT-998/999/1100 Improving search term highlighting in results | |||||
| * | | Improved highlighting of search flags to handle quotes and flags | hmhealey | 2015-11-12 | 1 | -18/+86 | |
| | | | ||||||
* | | | Merge pull request #1417 from florianorben/PLT-1141 | Christopher Speller | 2015-11-13 | 1 | -0/+1 | |
|\ \ \ | | | | | | | | | PLT-1141: Page previews can overflow their boundaries | |||||
| * | | | PLT-1141: Page previews can overflow their boundaries | Florian Orben | 2015-11-12 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Merge pull request #1414 from lindy65/patch-9 | Christopher Speller | 2015-11-13 | 1 | -2/+19 | |
|\ \ \ \ | | | | | | | | | | | Update documentation-guidelines.md | |||||
| * | | | | Update documentation-guidelines.md | lindy65 | 2015-11-12 | 1 | -2/+19 | |
| |/ / / | | | | | | | | | Fixed typo on line 44 and added "Sub-section Headings..." | |||||
* | | | | Merge pull request #1421 from mattermost/help-docs-update | it33 | 2015-11-13 | 7 | -73/+99 | |
|\ \ \ \ | | | | | | | | | | | Docs update | |||||
| * | | | | Delete Slack-Import.md | it33 | 2015-11-12 | 1 | -29/+0 | |
| | | | | | ||||||
| * | | | | Update README.md | it33 | 2015-11-12 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Update Team-Settings.md | it33 | 2015-11-12 | 1 | -0/+8 | |
| | | | | | ||||||
| * | | | | Update Team-Settings.md | it33 | 2015-11-12 | 1 | -0/+8 | |
| | | | | | ||||||
| * | | | | Update and rename doc/help/team-settings/General-Settings.md to ↵ | it33 | 2015-11-12 | 2 | -19/+54 | |
| | | | | | | | | | | | | | | | | | | | | doc/help/Team-Settings.md | |||||
| * | | | | Update General-Settings.md | it33 | 2015-11-12 | 1 | -4/+6 | |
| | | | | | ||||||
| * | | | | Update README.md | it33 | 2015-11-12 | 1 | -2/+4 | |
| | | | | | ||||||
| * | | | | Update README.md | it33 | 2015-11-12 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Update Team-Statistics.md | it33 | 2015-11-12 | 1 | -4/+4 | |
| | | | | | ||||||
| * | | | | Update Team-Statistics.md | it33 | 2015-11-12 | 1 | -9/+9 | |
| | | | | | ||||||
| * | | | | Rename doc/help/Team-Statistics.md to doc/help/system-console/Team-Statistics.md | it33 | 2015-11-12 | 1 | -0/+0 | |
| | | | | | ||||||
| * | | | | Rename doc/help/team-settings/Manage-Members.md to doc/help/Manage-Members.md | it33 | 2015-11-12 | 1 | -0/+0 | |
|/ / / / | ||||||
* | | | | Rename doc/help/Slack-Import.md to doc/help/team-settings/Slack-Import.md | it33 | 2015-11-12 | 1 | -0/+0 | |
| | | | | ||||||
* | | | | Rename doc/help/Manage-Members.md to doc/help/team-settings/Manage-Members.md | it33 | 2015-11-12 | 1 | -0/+0 | |
| | | | |