summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1858 from mattermost/release-1.4Corey Hulen2016-01-118-0/+322
|\
| * Release 1.4 rc1=Corey Hulen2016-01-118-0/+322
|/
* Merge pull request #1856 from mattermost/react-rm-debugCorey Hulen2016-01-111-7/+3
|\
| * Removing react debugging=Corey Hulen2016-01-111-7/+3
|/
* 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-1110-38/+144
|\ \ \
| * | | 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
| * | | Added the ability to get more channel members from getChannelExtraInfohmhealey2016-01-066-15/+73
* | | | 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
| | |/ / | |/| |
* | | | Update Upgrade-Guide.mdit332016-01-101-1/+1
* | | | Merge pull request #1839 from mattermost/lfbrock-patch-2Corey Hulen2016-01-091-0/+43
|\ \ \ \
| * | | | Create test-search.mdlfbrock2016-01-081-0/+43
* | | | | Merge pull request #1840 from mattermost/lfbrock-patch-1Corey Hulen2016-01-091-0/+128
|\ \ \ \ \
| * | | | | Update CHANGELOG.mdlfbrock2016-01-081-6/+11
| * | | | | Update CHANGELOG.mdlfbrock2016-01-081-2/+2
| * | | | | Update CHANGELOG.mdlfbrock2016-01-081-2/+2
| * | | | | Update CHANGELOG.mdlfbrock2016-01-071-0/+1
| * | | | | Merge pull request #1831 from mattermost/Adding-highlights,-minor-tweakslfbrock2016-01-071-10/+26
| |\ \ \ \ \
| | * | | | | 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=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."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.=Corey Hulen2016-01-081-3/+3
|/ / / / /
* | | | | Merge pull request #1836 from hmhealey/plt1578Christopher Speller2016-01-081-0/+12
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | 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.mdlfbrock2016-01-071-24/+69
| |/ /
* | | Merge pull request #1821 from rgarmsen2295/plt-846Corey Hulen2016-01-074-24/+30
|\ \ \ | |/ / |/| |
| * | 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-0610-25/+192
|\ \ | |/ |/|
| * 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
|\ \