summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Adding highlights, minor tweaksit332016-01-071-10/+26
| | | | | | |
| * | | | | | Update CHANGELOG.mdlfbrock2016-01-071-5/+5
| |/ / / / /
| * | | | | Update CHANGELOG.mdlfbrock2016-01-071-2/+2
| | | | | |
| * | | | | Update CHANGELOG.mdlfbrock2016-01-071-4/+4
| | | | | |
| * | | | | Update CHANGELOG.mdlfbrock2016-01-071-1/+1
| | | | | |
| * | | | | Update CHANGELOG.mdlfbrock2016-01-071-0/+106
| | |/ / / | |/| | |
* | | | | Merge pull request #1846 from mattermost/react-dbgCorey Hulen2016-01-081-3/+7
|\ \ \ \ \ | | | | | | | | | | | | Adding debugging for react
| * | | | | Adding debugging for react=Corey Hulen2016-01-081-3/+7
|/ / / / /
* | | | | Merge pull request #1843 from mattermost/revert-1842-react-debugCorey Hulen2016-01-081-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Revert "Removing minified for react to track down an issues."
| * | | | | Revert "Removing minified for react to track down an issues."Corey Hulen2016-01-081-3/+3
|/ / / / /
* | | | | Merge pull request #1842 from mattermost/react-debugCorey Hulen2016-01-081-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Removing minified for react to track down an issues.
| * | | | | Removing minified for react to track down an issues.=Corey Hulen2016-01-081-3/+3
|/ / / / /
* | | | | Merge pull request #1836 from hmhealey/plt1578Christopher Speller2016-01-081-0/+12
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | PLT-1578 Fixed FileUpload to properly unbind drag handlers when unmounted
| * | | Fixed FileUpload to properly unbind drag handlers when unmountedhmhealey2016-01-081-0/+12
|/ / /
* | | Merge pull request #1829 from mattermost/lfbrock-patch-2Corey Hulen2016-01-071-24/+69
|\ \ \ | | | | | | | | Update Configuration-Settings.md
| * | | Update Configuration-Settings.mdlfbrock2016-01-071-24/+69
| |/ /
* | | Merge pull request #1821 from rgarmsen2295/plt-846Corey Hulen2016-01-074-24/+30
|\ \ \ | |/ / |/| | PLT-846 Disable the ability to drag and drop text
| * | Removed ability to drag n' drop text; drag n' drop ui no longer appears when ↵Reed Garmsen2016-01-064-24/+30
|/ / | | | | | | non-files are dragged
* | 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
| | |