Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | PLT-1557 revoking sessions from same device | =Corey Hulen | 2016-01-05 | 2 | -7/+56 | |
| | | | | ||||||
* | | | | Merge pull request #1817 from apskim/patch-1 | Joram Wilander | 2016-01-06 | 1 | -1/+2 | |
|\ \ \ \ | |_|_|/ |/| | | | [Fix #1669] Allow parameters in Content-Type of incoming webhook request | |||||
| * | | | [Fix #1669] Allow parameters in Content-Type of incoming webhook request | Alex Polozov | 2016-01-06 | 1 | -1/+2 | |
|/ / / | | | | | | | | | | Mattermost currently does not allow optional parameters in the `Content-Type` of an incoming webhook request. Visual Studio Team Services's Slack integration sends its message with `Content-Type: application/json; charset=utf-8`, whereas Mattermost currently requires precisely `Content-Type: application/json`. This PR relaxes this check, looking only at the media part of the header. | |||||
* | | | Merge pull request #1807 from mattermost/PLT-1572 | Christopher Speller | 2016-01-05 | 4 | -7/+12 | |
|\ \ \ | | | | | | | | | PLT-1572 Adding more info to the error message | |||||
| * | | | Fixing Import | =Corey Hulen | 2016-01-05 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Moving to constnt | =Corey Hulen | 2016-01-05 | 2 | -3/+7 | |
| | | | | ||||||
| * | | | Fixing error message | =Corey Hulen | 2016-01-05 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | PLT-1572 Adding more info to the error message | =Corey Hulen | 2016-01-05 | 3 | -6/+6 | |
| |/ / | ||||||
* | | | Merge pull request #1802 from hmhealey/plt1449 | Christopher Speller | 2016-01-05 | 3 | -118/+184 | |
|\ \ \ | |_|/ |/| | | PLT-1449 Made Youtube previews stop when the current channel is changed | |||||
| * | | Make Youtube previews stop when the channel is changed | hmhealey | 2016-01-04 | 3 | -2/+21 | |
| | | | ||||||
| * | | Move Youtube preview into its own file | hmhealey | 2016-01-04 | 2 | -117/+164 | |
| | | | ||||||
* | | | Merge pull request #1810 from hmhealey/plt644 | Christopher Speller | 2016-01-05 | 1 | -4/+0 | |
|\ \ \ | |_|/ |/| | | PLT-644 Updated about dialog | |||||
| * | | Updated about dialog | hmhealey | 2016-01-05 | 1 | -4/+0 | |
| | | | ||||||
* | | | Merge pull request #1804 from rgarmsen2295/plt-1536 | Corey Hulen | 2016-01-05 | 1 | -7/+13 | |
|\ \ \ | |/ / |/| | | PLT-1536 Fixed issue where font would not reset even after cancelling or exiting settings | |||||
| * | | Fixed issue where font would remain changed even after cancelling changes | Reed Garmsen | 2016-01-04 | 1 | -7/+13 | |
| | | | ||||||
* | | | Update Upgrade-Guide.md | it33 | 2016-01-05 | 1 | -1/+18 | |
| | | | ||||||
* | | | Merge pull request #1805 from ejm2172/patch-1 | it33 | 2016-01-04 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | Added word "team" | |||||
| * | | Added word "team" | Earl Myers | 2016-01-04 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #1801 from hmhealey/plt1602 | Christopher Speller | 2016-01-04 | 2 | -17/+35 | |
|\ \ | | | | | | | PLT-1602 Fix ViewImageModal incorrectly assuming it has a file's info in certain cases | |||||
| * | | Fixed ViewImage modal to clear its loaded state when its file list changes | hmhealey | 2016-01-04 | 2 | -9/+19 | |
| | | | ||||||
| * | | Changed the ViewImageModal to only store info for the current image | hmhealey | 2016-01-04 | 1 | -8/+16 | |
| |/ | ||||||
* | | Merge pull request #1745 from mattermost/plt-1118 | Christopher Speller | 2016-01-04 | 20 | -267/+1214 | |
|\ \ | | | | | | | PLT-1118 Add ability to switch between SSO and email account | |||||
| * | | Add ability to switch between SSO and email account | JoramWilander | 2015-12-17 | 20 | -267/+1214 | |
| | | | ||||||
* | | | Merge pull request #1715 from rgarmsen2295/plt-1148 | Joram Wilander | 2016-01-04 | 3 | -3/+26 | |
|\ \ \ | |_|/ |/| | | PLT-1148 Opens links within help text in a new tab rather than the current tab | |||||
| * | | Made links in help text open in a new tab | Reed Garmsen | 2016-01-04 | 3 | -3/+26 | |
|/ / | ||||||
* | | Merge pull request #1788 from hjf288/GIT-1682 | Corey Hulen | 2016-01-04 | 4 | -124/+171 | |
|\ \ | | | | | | | GIT-1682: Complete the SSL configuration section of the documentation… | |||||
| * | | Add missing DH param generation instructions to SSL section | Hjf288 | 2015-12-29 | 3 | -4/+4 | |
| | | | ||||||
| * | | GIT-1682: Complete the SSL configuration section of the documentation and ↵ | Hjf288 | 2015-12-28 | 4 | -120/+167 | |
| | | | | | | | | | | | | normalise the spacing in the NGINX config examples | |||||
* | | | Merge pull request #1785 from mattermost/plt-1492 | Corey Hulen | 2016-01-04 | 1 | -11/+14 | |
|\ \ \ | | | | | | | | | PLT-1492 Fix default for teammate name display setting | |||||
| * | | | Fix default for teammate name display setting | JoramWilander | 2015-12-28 | 1 | -11/+14 | |
| |/ / | ||||||
* | | | Merge pull request #1784 from mattermost/plt-1591 | Corey Hulen | 2016-01-04 | 1 | -3/+6 | |
|\ \ \ | | | | | | | | | PLT-1591 Fix appearance settings scroll bug | |||||
| * | | | Fix appearance settings scroll bug | JoramWilander | 2015-12-28 | 1 | -3/+6 | |
| |/ / | ||||||
* | | | Merge pull request #1800 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-01-04 | 6 | -26/+48 | |
|\ \ \ | | | | | | | | | Multiple UI Improvements | |||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2016-01-04 | 6 | -26/+48 | |
| | | | | ||||||
* | | | | Merge pull request #1770 from mattermost/GIT-1766 | Christopher Speller | 2016-01-04 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | GIT-1766 fixing typo | |||||
| * | | | | GIT-1766 fixing typo | =Corey Hulen | 2015-12-23 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #1769 from mattermost/PLT-1488 | Christopher Speller | 2016-01-04 | 2 | -1/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1488 fixing error message from session revoke | |||||
| * | | | | | Fixing multi team issue | =Corey Hulen | 2015-12-23 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | PLT-1488 fixing error message from session revoke | =Corey Hulen | 2015-12-23 | 1 | -0/+3 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1763 from benburkert/non-s3-region | Christopher Speller | 2016-01-04 | 2 | -17/+45 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | support unofficial S3 regions | |||||
| * | | | | support unofficial S3 regions | Ben Burkert | 2015-12-21 | 2 | -17/+45 | |
| | | | | | | | | | | | | | | | | | | | | Adds support for S3 clones like Ceph. | |||||
* | | | | | Merge pull request #1787 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-03 | 1 | -1/+6 | |
|\ \ \ \ \ | | | | | | | | | | | | | Improving spacing for bullet points. | |||||
| * | | | | | Fixing bullets | Asaad Mahmood | 2015-12-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Fixing bullets | Asaad Mahmood | 2015-12-28 | 1 | -1/+6 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #1786 from hjf288/PLT-853 | Corey Hulen | 2016-01-03 | 2 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-853: Correct mail templates to show "You've joined the [teamname] team"... | |||||
| * | | | | | Correct mail templates to show 'You've been invited to [teamname] team' ↵ | Hjf288 | 2015-12-28 | 2 | -2/+2 | |
| |/ / / / | | | | | | | | | | | | | | | | rather than you've been invited when signing up | |||||
* | | | | | Merge pull request #1790 from hjf288/PLT-1587 | Corey Hulen | 2016-01-03 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1587 - REGRESSION: Mattermost v1.3.0 System Console does not save Email Settings | |||||
| * | | | | | Correct typo in email_settings.jsx that prevents enabling the 'Send push ↵ | Hjf288 | 2015-12-29 | 1 | -1/+1 | |
| |/ / / / | | | | | | | | | | | | | | | | notifications' option | |||||
* | | | | | Merge pull request #1794 from esethna/patch-48 | Corey Hulen | 2016-01-03 | 4 | -3/+5 | |
|\ \ \ \ \ | | | | | | | | | | | | | Docs and help text changes | |||||
| * | | | | | Update README.md index for docs/help menu | Eric Sethna | 2015-12-30 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | Add "notifications" and "creating teams" to readme index |