summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #1813 from mattermost/PLT-1558Harrison Healey2016-01-0610-25/+192
|\ \ | |/ |/| PLT-1558 adding session length to config file
| * Adding UI for session length settings=Corey Hulen2016-01-052-9/+133
| |
| * PLT-1558 adding session length to config file=Corey Hulen2016-01-059-24/+67
| |
* | Merge pull request #1819 from hmhealey/plt1401Joram Wilander2016-01-061-3/+3
|\ \ | | | | | | PLT-1401 Removed email regex
| * | Removed email regexhmhealey2016-01-061-3/+3
| | |
* | | Merge pull request #1815 from hmhealey/plt771Corey Hulen2016-01-066-97/+186
|\ \ \ | |/ / |/| | PLT-771 Improved Audio/Video preview for unsupported formats
| * | Removed temporary fix for old filenames that used absolute urls pointing to ↵hmhealey2016-01-063-26/+3
| | | | | | | | | | | | the get file api
| * | Changed Audio/Video preview to just display a file info when encountering a ↵hmhealey2016-01-064-78/+190
|/ / | | | | | | file that cannot be played
* | Merge pull request #1816 from mattermost/PLT-1607Christopher Speller2016-01-065-5/+19
|\ \ | | | | | | PLT-1607 adding more debugging info for email and push notifications
| * | Adding missing config properties=Corey Hulen2016-01-052-2/+10
| | |
| * | Cleaning up config=Corey Hulen2016-01-051-23/+0
| | |
| * | PLT-1607 adding more debugging info for email and push notifications=Corey Hulen2016-01-052-4/+31
| | |
| * | PLT-1607 adding more debugging info for email and push notifications=Corey Hulen2016-01-052-0/+2
| | |
* | | Merge pull request #1814 from mattermost/PLT-1485aChristopher Speller2016-01-063-1/+20
|\ \ \ | | | | | | | | PLT-1485 Adding last view channel sticky
| * | | PLT-1485 Adding last view channel sticky=Corey Hulen2016-01-053-1/+20
| | | |
* | | | Merge pull request #1809 from mattermost/PLT-1557Christopher Speller2016-01-062-7/+56
|\ \ \ \ | | |_|/ | |/| | PLT-1557 revoking sessions from same device
| * | | PLT-1557 revoking sessions from same device=Corey Hulen2016-01-052-7/+56
| | | |
* | | | Merge pull request #1817 from apskim/patch-1Joram Wilander2016-01-061-1/+2
|\ \ \ \ | |_|_|/ |/| | | [Fix #1669] Allow parameters in Content-Type of incoming webhook request
| * | | [Fix #1669] Allow parameters in Content-Type of incoming webhook requestAlex Polozov2016-01-061-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-1572Christopher Speller2016-01-054-7/+12
|\ \ \ | | | | | | | | PLT-1572 Adding more info to the error message
| * | | Fixing Import=Corey Hulen2016-01-051-0/+1
| | | |
| * | | Moving to constnt=Corey Hulen2016-01-052-3/+7
| | | |
| * | | Fixing error message=Corey Hulen2016-01-051-1/+1
| | | |
| * | | PLT-1572 Adding more info to the error message=Corey Hulen2016-01-053-6/+6
| |/ /
* | | Merge pull request #1802 from hmhealey/plt1449Christopher Speller2016-01-053-118/+184
|\ \ \ | |_|/ |/| | PLT-1449 Made Youtube previews stop when the current channel is changed
| * | Make Youtube previews stop when the channel is changedhmhealey2016-01-043-2/+21
| | |
| * | Move Youtube preview into its own filehmhealey2016-01-042-117/+164
| | |
* | | Merge pull request #1810 from hmhealey/plt644Christopher Speller2016-01-051-4/+0
|\ \ \ | |_|/ |/| | PLT-644 Updated about dialog
| * | Updated about dialoghmhealey2016-01-051-4/+0
| | |
* | | Merge pull request #1804 from rgarmsen2295/plt-1536Corey Hulen2016-01-051-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 changesReed Garmsen2016-01-041-7/+13
| | |
* | | Update Upgrade-Guide.mdit332016-01-051-1/+18
| | |
* | | Merge pull request #1805 from ejm2172/patch-1it332016-01-041-1/+1
|\ \ \ | |/ / |/| | Added word "team"
| * | Added word "team"Earl Myers2016-01-041-1/+1
|/ /
* | Merge pull request #1801 from hmhealey/plt1602Christopher Speller2016-01-042-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 changeshmhealey2016-01-042-9/+19
| | |
| * | Changed the ViewImageModal to only store info for the current imagehmhealey2016-01-041-8/+16
| |/
* | Merge pull request #1745 from mattermost/plt-1118Christopher Speller2016-01-0420-267/+1214
|\ \ | | | | | | PLT-1118 Add ability to switch between SSO and email account
| * | Add ability to switch between SSO and email accountJoramWilander2015-12-1720-267/+1214
| | |
* | | Merge pull request #1715 from rgarmsen2295/plt-1148Joram Wilander2016-01-043-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 tabReed Garmsen2016-01-043-3/+26
|/ /
* | Merge pull request #1788 from hjf288/GIT-1682Corey Hulen2016-01-044-124/+171
|\ \ | | | | | | GIT-1682: Complete the SSL configuration section of the documentation…
| * | Add missing DH param generation instructions to SSL sectionHjf2882015-12-293-4/+4
| | |
| * | GIT-1682: Complete the SSL configuration section of the documentation and ↵Hjf2882015-12-284-120/+167
| | | | | | | | | | | | normalise the spacing in the NGINX config examples
* | | Merge pull request #1785 from mattermost/plt-1492Corey Hulen2016-01-041-11/+14
|\ \ \ | | | | | | | | PLT-1492 Fix default for teammate name display setting
| * | | Fix default for teammate name display settingJoramWilander2015-12-281-11/+14
| |/ /
* | | Merge pull request #1784 from mattermost/plt-1591Corey Hulen2016-01-041-3/+6
|\ \ \ | | | | | | | | PLT-1591 Fix appearance settings scroll bug
| * | | Fix appearance settings scroll bugJoramWilander2015-12-281-3/+6
| |/ /
* | | Merge pull request #1800 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-01-046-26/+48
|\ \ \ | | | | | | | | Multiple UI Improvements
| * | | Multiple UI ImprovementsAsaad Mahmood2016-01-046-26/+48
| | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 09:09:08 +0000