summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1852 from mattermost/PLT-1608Joram Wilander2016-01-121-1/+1
|\ | | | | PLT-1608 Upgrading logging package
| * Upgrade logging package=Corey Hulen2016-01-111-1/+1
| |
* | Adding push-test.mattermost.comit332016-01-111-2/+2
| |
* | Merge pull request #1854 from hmhealey/plt1608Joram Wilander2016-01-111-1/+1
|\ \ | | | | | | PLT-1608 Fixed developer errors storing invalid error objects
| * | Fixed developer errors storing invalid error objectshmhealey2016-01-111-1/+1
| |/
* | Merge pull request #1849 from hmhealey/plt1578Corey Hulen2016-01-112-8/+36
|\ \ | |/ |/| PLT-571 Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs
| * Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugshmhealey2016-01-112-8/+36
| |
* | Merge pull request #1822 from asaadmahmoodspin/ui-improvementsHarrison Healey2016-01-115-5/+13
|\ \ | | | | | | Multiple UI Improvements
| * | Updating fixAsaad Mahmood2016-01-081-1/+1
| | |
| * | Multiple UI ImprovementsAsaad Mahmood2016-01-075-5/+13
| | |
* | | Merge pull request #1824 from hmhealey/plt1525Joram Wilander2016-01-114-23/+71
|\ \ \ | | | | | | | | PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel
| * | | Added a loading screen to ChannelMembersModal and made it pull all channel ↵hmhealey2016-01-071-13/+36
| | | | | | | | | | | | | | | | members before rendering
| * | | Made ChannelInviteModal pull all channel members before renderinghmhealey2016-01-073-10/+35
| | | |
* | | | Merge pull request #1828 from hmhealey/plt1397Joram Wilander2016-01-111-15/+6
|\ \ \ \ | |_|_|/ |/| | | PLT-1397/PLT-1580/PLT-1614 Fixed spacing around markdown lists and paragraphs
| * | | Fixed spacing between paragraphs in a posthmhealey2016-01-071-1/+4
| | | |
| * | | Fixed vertical spacing between lists and paragraphs in post bodieshmhealey2016-01-071-11/+3
| | | |
| * | | Removed extra space below unordered listshmhealey2016-01-071-5/+1
| | |/ | |/|
* | | Fixed FileUpload to properly unbind drag handlers when unmountedhmhealey2016-01-081-0/+12
| | |
* | | 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-062-2/+133
|\ \ | |/ |/| PLT-1558 adding session length to config file
| * Adding UI for session length settings=Corey Hulen2016-01-051-1/+132
| |
| * PLT-1558 adding session length to config file=Corey Hulen2016-01-051-1/+1
| |
* | Merge pull request #1819 from hmhealey/plt1401Joram Wilander2016-01-061-3/+3
|\ \ | | | | | | PLT-1401 Removed email regex
| * | Removed email regexhmhealey2016-01-061-3/+3
| | |
* | | 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 #1814 from mattermost/PLT-1485aChristopher Speller2016-01-061-1/+8
|\ \ | | | | | | PLT-1485 Adding last view channel sticky
| * | PLT-1485 Adding last view channel sticky=Corey Hulen2016-01-051-1/+8
| | |
* | | [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 #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
| | |
* | | Fixed issue where font would remain changed even after cancelling changesReed Garmsen2016-01-041-7/+13
|/ /
* | 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-0410-243/+668
|\ \ | | | | | | PLT-1118 Add ability to switch between SSO and email account
| * | Add ability to switch between SSO and email accountJoramWilander2015-12-1710-243/+668
| | |
* | | Made links in help text open in a new tabReed Garmsen2016-01-043-3/+26
| |/ |/|
* | 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-045-25/+47
|\ \ \ | | | | | | | | Multiple UI Improvements
| * | | Multiple UI ImprovementsAsaad Mahmood2016-01-045-25/+47
| | | |
* | | | Merge pull request #1769 from mattermost/PLT-1488Christopher Speller2016-01-042-1/+4
|\ \ \ \ | |/ / / |/| | | PLT-1488 fixing error message from session revoke
| * | | Fixing multi team issue=Corey Hulen2015-12-231-1/+1
| | | |
| * | | PLT-1488 fixing error message from session revoke=Corey Hulen2015-12-231-0/+3
| | | |