Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update CHANGELOG.md | lfbrock | 2016-01-07 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md | lfbrock | 2016-01-07 | 1 | -0/+106 |
| | |||||
* | Merge pull request #1813 from mattermost/PLT-1558 | Harrison Healey | 2016-01-06 | 10 | -25/+192 |
|\ | | | | | PLT-1558 adding session length to config file | ||||
| * | Adding UI for session length settings | =Corey Hulen | 2016-01-05 | 2 | -9/+133 |
| | | |||||
| * | PLT-1558 adding session length to config file | =Corey Hulen | 2016-01-05 | 9 | -24/+67 |
| | | |||||
* | | Merge pull request #1819 from hmhealey/plt1401 | Joram Wilander | 2016-01-06 | 1 | -3/+3 |
|\ \ | | | | | | | PLT-1401 Removed email regex | ||||
| * | | Removed email regex | hmhealey | 2016-01-06 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #1815 from hmhealey/plt771 | Corey Hulen | 2016-01-06 | 6 | -97/+186 |
|\ \ \ | |/ / |/| | | PLT-771 Improved Audio/Video preview for unsupported formats | ||||
| * | | Removed temporary fix for old filenames that used absolute urls pointing to ↵ | hmhealey | 2016-01-06 | 3 | -26/+3 |
| | | | | | | | | | | | | the get file api | ||||
| * | | Changed Audio/Video preview to just display a file info when encountering a ↵ | hmhealey | 2016-01-06 | 4 | -78/+190 |
|/ / | | | | | | | file that cannot be played | ||||
* | | Merge pull request #1816 from mattermost/PLT-1607 | Christopher Speller | 2016-01-06 | 5 | -5/+19 |
|\ \ | | | | | | | PLT-1607 adding more debugging info for email and push notifications | ||||
| * | | Adding missing config properties | =Corey Hulen | 2016-01-05 | 2 | -2/+10 |
| | | | |||||
| * | | Cleaning up config | =Corey Hulen | 2016-01-05 | 1 | -23/+0 |
| | | | |||||
| * | | PLT-1607 adding more debugging info for email and push notifications | =Corey Hulen | 2016-01-05 | 2 | -4/+31 |
| | | | |||||
| * | | PLT-1607 adding more debugging info for email and push notifications | =Corey Hulen | 2016-01-05 | 2 | -0/+2 |
| | | | |||||
* | | | Merge pull request #1814 from mattermost/PLT-1485a | Christopher Speller | 2016-01-06 | 3 | -1/+20 |
|\ \ \ | | | | | | | | | PLT-1485 Adding last view channel sticky | ||||
| * | | | PLT-1485 Adding last view channel sticky | =Corey Hulen | 2016-01-05 | 3 | -1/+20 |
| | | | | |||||
* | | | | Merge pull request #1809 from mattermost/PLT-1557 | Christopher Speller | 2016-01-06 | 2 | -7/+56 |
|\ \ \ \ | | |_|/ | |/| | | PLT-1557 revoking sessions from same device | ||||
| * | | | 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 |
| |/ / |