summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Fix indentationAndy Lo-A-Foe2016-01-201-7/+7
* Optionally specify ws:// and wss:// port in configAndy Lo-A-Foe2016-01-192-1/+12
* Merge pull request #1894 from mattermost/release-1.4Corey Hulen2016-01-141-3/+3
|\
| * Encode url query properly for SSO switchingJoramWilander2016-01-141-3/+3
* | Fix error messageJoramWilander2016-01-141-5/+10
* | Minor update to about modalJoramWilander2016-01-141-4/+1
* | Added license validation and settingsJoramWilander2016-01-1411-27/+397
* | Merge pull request #1855 from rgarmsen2295/plt-1006Corey Hulen2016-01-134-7/+45
|\ \
| * | Changed statistics to show usernames with an email tooltipReed Garmsen2016-01-114-7/+45
* | | Merge pull request #1853 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-135-6/+20
|\ \ \
| * | | Adding away icon and changing online and offline iconsAsaad Mahmood2016-01-115-6/+20
* | | | Merge pull request #1850 from mattermost/preview-modeCorey Hulen2016-01-131-1/+1
|\ \ \ \
| * | | | Update email_settings.jsxit332016-01-091-1/+1
| * | | | Documenting how Preview Mode turns offit332016-01-091-1/+1
* | | | | Merge pull request #1876 from mattermost/release-1.4Corey Hulen2016-01-121-1/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Add removal commentsJoramWilander2016-01-121-2/+2
| * | | | Support old oauth routesJoramWilander2016-01-121-1/+3
* | | | | Merge pull request #1830 from rgarmsen2295/plt-1599Joram Wilander2016-01-121-2/+8
|\ \ \ \ \
| * | | | | Help text in invite member modal now updates according to town-square display...Reed Garmsen2016-01-071-2/+8
* | | | | | Merge pull request #1852 from mattermost/PLT-1608Joram Wilander2016-01-121-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixed developer errors storing invalid error objectshmhealey2016-01-111-1/+1
| |/ / /
* | | | Merge pull request #1849 from hmhealey/plt1578Corey Hulen2016-01-112-8/+36
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \
| * | | 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
|\ \ \
| * | | Added a loading screen to ChannelMembersModal and made it pull all channel me...hmhealey2016-01-071-13/+36
| * | | Made ChannelInviteModal pull all channel members before renderinghmhealey2016-01-073-10/+35
* | | | Merge pull request #1828 from hmhealey/plt1397Joram Wilander2016-01-111-15/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
|/ /
* | Merge pull request #1813 from mattermost/PLT-1558Harrison Healey2016-01-062-2/+133
|\ \ | |/ |/|
| * 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
|\ \
| * | Removed email regexhmhealey2016-01-061-3/+3
* | | Removed temporary fix for old filenames that used absolute urls pointing to t...hmhealey2016-01-063-26/+3
* | | Changed Audio/Video preview to just display a file info when encountering a f...hmhealey2016-01-064-78/+190
|/ /
* | Merge pull request #1814 from mattermost/PLT-1485aChristopher Speller2016-01-061-1/+8
|\ \
| * | 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
* | | Merge pull request #1802 from hmhealey/plt1449Christopher Speller2016-01-053-118/+184
|\ \ \ | |/ / |/| |
| * | Make Youtube previews stop when the channel is changedhmhealey2016-01-043-2/+21