summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update docs for the GitLab SSO configuration config parameter Vlad Filippov2015-11-201-1/+1
| | | Based on https://github.com/mattermost/platform/blob/master/config/config.json#L86
* Merge pull request #1480 from jonathanwiesel/masterit332015-11-201-0/+2
|\ | | | | Add node.js and disqus integrations
| * Add node.js and disqus integrationsJonathan Wiesel2015-11-201-0/+2
| |
* | Merge pull request #1479 from mattermost/lfbrock-patch-1it332015-11-201-2/+30
|\ \ | |/ |/| Update Markdown.md
| * Update Markdown.mdlfbrock2015-11-201-2/+30
| |
* | Merge pull request #1478 from mattermost/plt-1237Harrison Healey2015-11-20165-859/+885
|\ \ | |/ |/| PLT-1237 Upgrading dependancies
| * Patching strange travis eslint problemChristopher Speller2015-11-192-2/+2
| |
| * Upgrading client dependancies. Upgrading to babel 6. Moving to es6 package ↵Christopher Speller2015-11-19162-836/+841
| | | | | | | | system.
| * Upgrading ESLint and adding some more rules. Refactoring to meet these new rulesChristopher Speller2015-11-199-21/+42
| |
* | Merge pull request #1476 from mattermost/lfbrock-patch-1Christopher Speller2015-11-201-0/+44
|\ \ | | | | | | Update CHANGELOG.md
| * | Update CHANGELOG.mdlfbrock2015-11-191-0/+44
| |/
* | Merge pull request #1474 from esethna/patch-19Christopher Speller2015-11-201-0/+3
|\ \ | | | | | | Update Message.md
| * | Update Message.mdEric Sethna2015-11-191-0/+3
| |/ | | | | Add emojis and link to full list of supported emojis
* | Merge pull request #1470 from esethna/patch-17Christopher Speller2015-11-201-0/+45
|\ \ | | | | | | Create Channels.md
| * | Create Channels.mdEric Sethna2015-11-191-0/+45
| | | | | | | | | Channel documentation, reviewed by Lindy
* | | Merge pull request #1466 from esethna/patch-16Christopher Speller2015-11-201-1/+1
|\ \ \ | | | | | | | | Update edit_channel_purpose_modal.jsx
| * | | Fix typoEric Sethna2015-11-191-1/+1
| | | |
| * | | Update edit_channel_purpose_modal.jsxEric Sethna2015-11-181-1/+1
| | | | | | | | | | | | Clarify where the channel purpose is used.
* | | | Update Administration.mdit332015-11-191-0/+6
| |_|/ |/| |
* | | Merge pull request #1473 from hmhealey/eslintfixChristopher Speller2015-11-191-0/+2
|\ \ \ | | | | | | | | Made eslint ignore files using destructuring while a bug with eslint and babel-eslint is dealt with
| * | | Made eslint ignore files using destructuring while a bug with eslint and ↵hmhealey2015-11-191-0/+2
|/ / / | | | | | | | | | babel-eslint is dealt with
* | | Merge pull request #1468 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-11-197-8/+89
|\ \ \ | | | | | | | | Multiple UI Improvements
| * | | Updating dropdown contentAsaad Mahmood2015-11-191-0/+15
| | | |
| * | | Multiple UI ImprovementsAsaad Mahmood2015-11-197-8/+74
| | |/ | |/|
* | | Merge pull request #1469 from 42wim/plt-1087Joram Wilander2015-11-191-1/+1
|\ \ \ | |/ / |/| | PLT-1087: return NewAppError instead of nil
| * | PLT-1087: return NewAppError instead of nilWim2015-11-191-1/+1
|/ /
* | Merge pull request #1457 from hmhealey/plt729Christopher Speller2015-11-196-10/+78
|\ \ | | | | | | PLT-729 Added search button to mobile header
| * | Added search button to mobile navbarhmhealey2015-11-183-3/+36
| | |
| * | Added ability to open search sidebar programaticallyhmhealey2015-11-183-7/+42
| | |
* | | Merge pull request #1464 from hmhealey/plt733Christopher Speller2015-11-191-7/+14
|\ \ \ | | | | | | | | PLT-733 Changed file uploads to scroll currently uploading files into view
| * | | Changed file uploads to scroll currently uploading files into viewhmhealey2015-11-181-7/+14
| | |/ | |/|
* | | Merge pull request #1463 from florianorben/hide_help_link_on_mobileChristopher Speller2015-11-191-1/+1
|\ \ \ | | | | | | | | hide 'help' link on mobile screens
| * | | hide 'help' link on mobile screensFlorian Orben2015-11-181-1/+1
| | | |
* | | | Merge pull request #1461 from esethna/patch-15Christopher Speller2015-11-191-1/+1
|\ \ \ \ | | | | | | | | | | Update Message.md
| * | | | Update Message.mdEric Sethna2015-11-181-1/+1
| | |/ / | |/| | | | | | These instructions were incorrect. Shift-Enter adds a new line without sending
* | | | Merge pull request #1460 from esethna/patch-14Christopher Speller2015-11-191-2/+2
|\ \ \ \ | | | | | | | | | | Update create_post.jsx
| * | | | Update create_post.jsxEric Sethna2015-11-181-2/+2
| |/ / / | | | | | | | | Add Enter key instructions to the Sending Messages pop-over.
* | | | Merge pull request #1462 from asaadmahmoodspin/postsImprovementChristopher Speller2015-11-1920-793/+529
|\ \ \ \ | |/ / / |/| | | Posts structure improvement
| * | | Removing postInfo from post.jsxAsaad Mahmood2015-11-191-2/+0
| | | |
| * | | Posts structure improvementAsaad Mahmood2015-11-1920-791/+529
|/ / /
* | | Merge pull request #1448 from mattermost/PLT-975Joram Wilander2015-11-1825-5/+890
|\ \ \ | |/ / |/| | PLT-975 adding delete to command line tool
| * | fixing based on feedback=Corey Hulen2015-11-183-9/+20
| | |
| * | changing help text=Corey Hulen2015-11-161-2/+4
| | |
| * | Adding perm delete channels by team=Corey Hulen2015-11-163-0/+22
| | |
| * | Fixing unit tests=Corey Hulen2015-11-162-0/+5
| | |
| * | Adding perm delete to cmd line=Corey Hulen2015-11-1625-35/+461
| | |
| * | PLT-975 adding perm deletes=Corey Hulen2015-11-1618-0/+419
| | |
* | | Merge pull request #1430 from hmhealey/plt737aChristopher Speller2015-11-1811-97/+140
|\ \ \ | |_|/ |/| | PLT-737 Converted DeletePostModal to React-Bootstrap
| * | Converted DeletePostModal to React-Bootstraphmhealey2015-11-1811-97/+140
|/ /
* | Merge pull request #1423 from hmhealey/plt737Christopher Speller2015-11-1811-322/+254
|\ \ | | | | | | PLT-737 Converted first set of Modals to ReactBootstrap