summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fixed regression with setting channel notification settingsReed Garmsen2015-11-241-7/+10
| | |
* | | Update test-markdown.mdit332015-11-241-0/+11
| | |
* | | Merge pull request #1515 from mattermost/fix-unreadChristopher Speller2015-11-241-2/+4
|\ \ \ | | | | | | | | Fixing pending post deletion on other clients.
| * | | Fixing pending post deletion on other clients.Christopher Speller2015-11-241-2/+4
|/ / /
* | | Merge pull request #1513 from mattermost/fix-distChristopher Speller2015-11-241-3/+3
|\ \ \ | | | | | | | | Fix dist
| * | | Fix distChristopher Speller2015-11-241-3/+3
|/ / /
* | | Merge pull request #1511 from mattermost/update-client-depsCorey Hulen2015-11-2411-6301/+4552
|\ \ \ | |/ / |/| | Updating client dependancies (non-npm)
| * | Updating client dependancies (non-npm)Christopher Speller2015-11-2411-6301/+4552
|/ /
* | Merge pull request #1509 from lindy65/patch-12Christopher Speller2015-11-241-1/+1
|\ \ | | | | | | Update Administration.md
| * | Update Administration.mdlindy652015-11-241-1/+1
| | | | | | | | | Updated line 33 with link to [Troubleshooting Forum](https://forum.mattermost.org/t/about-the-trouble-shooting-category/150/1) in place of link to general forum.
* | | Merge pull request #1506 from mattermost/PLT-1223Christopher Speller2015-11-241-2/+2
|\ \ \ | | | | | | | | PLT-1223 fixing help links
| * | | PLT-1223 fixing help links=Corey Hulen2015-11-231-2/+2
| | |/ | |/|
* | | Merge pull request #1504 from mattermost/lfbrock-patch-3Christopher Speller2015-11-241-1/+3
|\ \ \ | | | | | | | | Update CHANGELOG.md
| * | | Update CHANGELOG.mdlfbrock2015-11-231-1/+3
| |/ /
* | | Merge pull request #1502 from mattermost/disable-allChristopher Speller2015-11-245-17/+22
|\ \ \ | | | | | | | | Disabling the all mention
| * | | fixing eslint=Corey Hulen2015-11-232-0/+4
| | | |
| * | | fixing typo=Corey Hulen2015-11-231-1/+1
| | | |
| * | | fixing typo=Corey Hulen2015-11-231-1/+1
| | | |
| * | | Disabling the all mention=Corey Hulen2015-11-236-18/+19
| | | |
* | | | Merge pull request #1500 from esethna/patch-21Christopher Speller2015-11-241-0/+106
|\ \ \ \ | | | | | | | | | | Create Account-Settings.md
| * | | | Create Account-Settings.mdEric Sethna2015-11-231-0/+106
| | | | | | | | | | | | | | | Reviewed by Lindy
* | | | | Merge pull request #1490 from hmhealey/plt1070Christopher Speller2015-11-243-1/+130
|\ \ \ \ \ | | | | | | | | | | | | PLT-1070 Added /loadtest url command
| * | | | | Fixed CommandList to not sometimes include an empty rowhmhealey2015-11-231-1/+1
| | | | | |
| * | | | | Added /loadtest url command to load arbitrary files as postshmhealey2015-11-232-0/+129
| | |/ / / | |/| | |
* | | | | Merge pull request #1488 from hmhealey/plt1259Christopher Speller2015-11-246-154/+119
|\ \ \ \ \ | | | | | | | | | | | | PLT-1259 Converted TeamMembersModal to React-Bootstrap
| * | | | | Converted TeamMembers (now called TeamMembersModal) to React-Bootstraphmhealey2015-11-236-154/+119
| |/ / / /
* | | | | Merge pull request #1482 from esethna/patch-20Christopher Speller2015-11-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Update user_settings_general.jsx
| * | | | | Update user_settings_general.jsxEric Sethna2015-11-201-2/+2
| | | | | | | | | | | | | | | | | | Clarify email help text
* | | | | | Merge pull request #1467 from rgarmsen2295/plt-1088Christopher Speller2015-11-241-30/+52
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | PLT-1088 Fixes issue where an admin could not delete a root post in the RHS
| * | | | | Fixes issue where an admin could not delete a root post in the RHSReed Garmsen2015-11-231-30/+52
| | |_|_|/ | |/| | |
* | | | | Removed unnecessary sentence fragmentit332015-11-231-2/+0
| | | | |
* | | | | Merge pull request #1507 from mattermost/help-indexit332015-11-234-197/+200
|\ \ \ \ \ | |/ / / / |/| | | | Creating index for end user help
| * | | | Update README.mdit332015-11-231-19/+1
| | | | |
| * | | | Update Markdown.mdit332015-11-231-178/+1
| | | | |
| * | | | Create Markdown.mdit332015-11-231-0/+180
| | | | |
| * | | | Create README.mdit332015-11-231-0/+18
|/ / / /
* | | | Merge pull request #1501 from mattermost/fix-mac-buildHarrison Healey2015-11-231-3/+6
|\ \ \ \ | |_|/ / |/| | | Fixing build on mac
| * | | Fixing build on macChristopher Speller2015-11-231-3/+6
|/ / /
* | | Merge pull request #1486 from vladikoff/patch-1Corey Hulen2015-11-231-1/+1
|\ \ \ | | | | | | | | Update docs for the GitLab SSO configuration config parameter
| * | | 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 #1485 from hmhealey/plt1151Corey Hulen2015-11-2323-399/+403
|\ \ \ | |_|/ |/| | PLT-1151 Refactor more modals to React-Bootstrap
| * | Moved show static methods out of modals and into EventHelpershmhealey2015-11-2311-47/+42
| | |
| * | Removed unused modal divs from channel.htmlhmhealey2015-11-231-10/+1
| | |
| * | Converted GetLinkModal to React-Bootstrap and added GetTeamInviteLinkModalhmhealey2015-11-2310-108/+163
| | |
| * | Cleaned up how channel intro messages display set channel header buttonhmhealey2015-11-231-28/+17
| | |
| * | Renamed EditChannelModal to EditChannelHeaderModalhmhealey2015-11-234-12/+12
| | |
| * | Ported EditChannelModal to React-Bootstraphmhealey2015-11-237-187/+161
| | |
* | | Merge pull request #1499 from mattermost/makefile-tweaksJoram Wilander2015-11-232-5/+7
|\ \ \ | |/ / |/| | Moving removal of data directory to nuke. Updating dev setup.
| * | Moving removal of data directory to nuke. Updating dev setup.Christopher Speller2015-11-232-5/+7
| | |
* | | Merge pull request #1498 from mattermost/eslint-updatesJoram Wilander2015-11-232-5/+5
|\ \ \ | |/ / |/| | ESLint updates. Enable no magic numbers as warning. Ignore stateless components.