summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix issue with drag n drop overlay in ie11Reed Garmsen2016-01-121-0/+4
* 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 #1857 from esethna/patch-51Joram Wilander2016-01-121-14/+13
|\ \
| * | Update test-attachments.mdEric Sethna2016-01-111-14/+13
* | | Merge pull request #1863 from esethna/patch-53Joram Wilander2016-01-121-0/+12
|\ \ \
| * | | Update test-markdown-basics.mdEric Sethna2016-01-111-0/+12
* | | | Merge pull request #1873 from mattermost/lfbrock-patch-2Joram Wilander2016-01-121-1/+1
|\ \ \ \
| * | | | Update test-markdown-basics.mdlfbrock2016-01-121-1/+1
| |/ / /
* | | | Merge pull request #1852 from mattermost/PLT-1608Joram Wilander2016-01-1251-660/+159
|\ \ \ \ | |/ / / |/| | |
| * | | modifying config=Corey Hulen2016-01-111-23/+0
| * | | Upgrading logging package=Corey Hulen2016-01-1120-625/+122
| * | | Upgrade logging package=Corey Hulen2016-01-1131-35/+60
* | | | Merge branch 'release-1.4'=Corey Hulen2016-01-111-2/+2
|\ \ \ \
| * \ \ \ Merge pull request #1860 from mattermost/push-test-v1.4Corey Hulen2016-01-111-2/+2
| |\ \ \ \
| | * | | | Adding push-test.mattermost.comit332016-01-111-2/+2
| |/ / / /
* | | / / 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
| | |/ / / | |/| | |