summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1878 from mattermost/release-1.4Corey Hulen2016-01-123-2/+2
|\ | | | | Fixing docker files for 1.4 RC2
| * Fixing config file=Corey Hulen2016-01-121-2/+19
| |
| * Fixing docker files for 1.4 RC2=Corey Hulen2016-01-124-21/+4
| |
* | Merge pull request #1876 from mattermost/release-1.4Corey Hulen2016-01-126-5/+10
|\| | | | | Release 1.4 RC2
| * 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 #1830 from rgarmsen2295/plt-1599Joram Wilander2016-01-121-2/+8
|\ \ \ | | | | | | | | PLT-1599 Help text in invite member modal now reflects the default channel name
| * | | Help text in invite member modal now updates according to town-square ↵Reed Garmsen2016-01-071-2/+8
| | | | | | | | | | | | | | | | display name
* | | | Merge pull request #1857 from esethna/patch-51Joram Wilander2016-01-121-14/+13
|\ \ \ \ | | | | | | | | | | Update test-attachments.md
| * | | | Update test-attachments.mdEric Sethna2016-01-111-14/+13
| | |_|/ | |/| | | | | | Update test doc after changes were made to how some audio and video files display and preview.
* | | | Merge pull request #1863 from esethna/patch-53Joram Wilander2016-01-121-0/+12
|\ \ \ \ | | | | | | | | | | Update test-markdown-basics.md
| * | | | Update test-markdown-basics.mdEric Sethna2016-01-111-0/+12
| | | | | | | | | | | | | | | Add carriage return tests
* | | | | Merge pull request #1873 from mattermost/lfbrock-patch-2Joram Wilander2016-01-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Update test-markdown-basics.md
| * | | | | Update test-markdown-basics.mdlfbrock2016-01-121-1/+1
| |/ / / /
* | | | | Merge pull request #1852 from mattermost/PLT-1608Joram Wilander2016-01-1251-660/+159
|\ \ \ \ \ | |/ / / / |/| | | | PLT-1608 Upgrading logging package
| * | | | 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.com
| | * | | | 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
| * | | 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
| | | |