summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update docker to 1.4 RC2=Corey Hulen2016-01-123-2/+2
|
* Merge pull request #1872 from mattermost/plt-1667Corey Hulen2016-01-122-2/+4
|\ | | | | PLT-1667 Support old OAuth routes
| * Add removal commentsJoramWilander2016-01-121-2/+2
| |
| * Support old oauth routesJoramWilander2016-01-122-2/+4
| |
* | Merge pull request #1862 from mattermost/lfbrock-patch-1Corey Hulen2016-01-121-0/+3
|\ \ | |/ |/| Update changelog.md
| * Update CHANGELOG.mdlfbrock2016-01-111-0/+1
| |
| * Update CHANGELOG.mdlfbrock2016-01-111-1/+1
| |
| * Update CHANGELOG.mdlfbrock2016-01-111-1/+0
| |
| * Update CHANGELOG.mdlfbrock2016-01-111-0/+3
| |
* | Merge pull request #1866 from mattermost/fix-docker-14Corey Hulen2016-01-111-2/+2
|\ \ | | | | | | Fixing dockerfile
| * | Fixing dockerfile=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.com
| * | Adding push-test.mattermost.comit332016-01-111-2/+2
|/ /
* / 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
| * Removing react debugging=Corey Hulen2016-01-111-7/+3
|/
* 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-1110-38/+144
|\ \ \ | | | | | | | | 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
| | | |
| * | | 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
|\ \ \ \ | | | | | | | | | | 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
| | |/ / | |/| |
* | | | 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.md
| * | | | Create test-search.mdlfbrock2016-01-081-0/+43
| | | | |
* | | | | Merge pull request #1840 from mattermost/lfbrock-patch-1Corey Hulen2016-01-091-0/+128
|\ \ \ \ \ | | | | | | | | | | | | Update changelog
| * | | | | 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 tweaks
| | * | | | | 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
|/ / / / /