Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1513 from mattermost/fix-dist | Christopher Speller | 2015-11-24 | 1 | -3/+3 |
|\ | | | | | Fix dist | ||||
| * | Fix dist | Christopher Speller | 2015-11-24 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #1511 from mattermost/update-client-deps | Corey Hulen | 2015-11-24 | 11 | -6301/+4552 |
|\ | | | | | Updating client dependancies (non-npm) | ||||
| * | Updating client dependancies (non-npm) | Christopher Speller | 2015-11-24 | 11 | -6301/+4552 |
|/ | |||||
* | Merge pull request #1509 from lindy65/patch-12 | Christopher Speller | 2015-11-24 | 1 | -1/+1 |
|\ | | | | | Update Administration.md | ||||
| * | Update Administration.md | lindy65 | 2015-11-24 | 1 | -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-1223 | Christopher Speller | 2015-11-24 | 1 | -2/+2 |
|\ \ | | | | | | | PLT-1223 fixing help links | ||||
| * | | PLT-1223 fixing help links | =Corey Hulen | 2015-11-23 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #1504 from mattermost/lfbrock-patch-3 | Christopher Speller | 2015-11-24 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Update CHANGELOG.md | ||||
| * | | | Update CHANGELOG.md | lfbrock | 2015-11-23 | 1 | -1/+3 |
| |/ / | |||||
* | | | Merge pull request #1502 from mattermost/disable-all | Christopher Speller | 2015-11-24 | 5 | -17/+22 |
|\ \ \ | | | | | | | | | Disabling the all mention | ||||
| * | | | fixing eslint | =Corey Hulen | 2015-11-23 | 2 | -0/+4 |
| | | | | |||||
| * | | | fixing typo | =Corey Hulen | 2015-11-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | fixing typo | =Corey Hulen | 2015-11-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Disabling the all mention | =Corey Hulen | 2015-11-23 | 6 | -18/+19 |
| | | | | |||||
* | | | | Merge pull request #1500 from esethna/patch-21 | Christopher Speller | 2015-11-24 | 1 | -0/+106 |
|\ \ \ \ | | | | | | | | | | | Create Account-Settings.md | ||||
| * | | | | Create Account-Settings.md | Eric Sethna | 2015-11-23 | 1 | -0/+106 |
| | | | | | | | | | | | | | | | Reviewed by Lindy | ||||
* | | | | | Merge pull request #1490 from hmhealey/plt1070 | Christopher Speller | 2015-11-24 | 3 | -1/+130 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1070 Added /loadtest url command | ||||
| * | | | | | Fixed CommandList to not sometimes include an empty row | hmhealey | 2015-11-23 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Added /loadtest url command to load arbitrary files as posts | hmhealey | 2015-11-23 | 2 | -0/+129 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #1488 from hmhealey/plt1259 | Christopher Speller | 2015-11-24 | 6 | -154/+119 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1259 Converted TeamMembersModal to React-Bootstrap | ||||
| * | | | | | Converted TeamMembers (now called TeamMembersModal) to React-Bootstrap | hmhealey | 2015-11-23 | 6 | -154/+119 |
| |/ / / / | |||||
* | | | | | Merge pull request #1482 from esethna/patch-20 | Christopher Speller | 2015-11-24 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Update user_settings_general.jsx | ||||
| * | | | | | Update user_settings_general.jsx | Eric Sethna | 2015-11-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | Clarify email help text | ||||
* | | | | | | Merge pull request #1467 from rgarmsen2295/plt-1088 | Christopher Speller | 2015-11-24 | 1 | -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 RHS | Reed Garmsen | 2015-11-23 | 1 | -30/+52 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Removed unnecessary sentence fragment | it33 | 2015-11-23 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | Merge pull request #1507 from mattermost/help-index | it33 | 2015-11-23 | 4 | -197/+200 |
|\ \ \ \ \ | |/ / / / |/| | | | | Creating index for end user help | ||||
| * | | | | Update README.md | it33 | 2015-11-23 | 1 | -19/+1 |
| | | | | | |||||
| * | | | | Update Markdown.md | it33 | 2015-11-23 | 1 | -178/+1 |
| | | | | | |||||
| * | | | | Create Markdown.md | it33 | 2015-11-23 | 1 | -0/+180 |
| | | | | | |||||
| * | | | | Create README.md | it33 | 2015-11-23 | 1 | -0/+18 |
|/ / / / | |||||
* | | | | Merge pull request #1501 from mattermost/fix-mac-build | Harrison Healey | 2015-11-23 | 1 | -3/+6 |
|\ \ \ \ | |_|/ / |/| | | | Fixing build on mac | ||||
| * | | | Fixing build on mac | Christopher Speller | 2015-11-23 | 1 | -3/+6 |
|/ / / | |||||
* | | | Merge pull request #1486 from vladikoff/patch-1 | Corey Hulen | 2015-11-23 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update docs for the GitLab SSO configuration config parameter | ||||
| * | | | Update docs for the GitLab SSO configuration config parameter | Vlad Filippov | 2015-11-20 | 1 | -1/+1 |
| |/ / | | | | | | | Based on https://github.com/mattermost/platform/blob/master/config/config.json#L86 | ||||
* | | | Merge pull request #1485 from hmhealey/plt1151 | Corey Hulen | 2015-11-23 | 23 | -399/+403 |
|\ \ \ | |_|/ |/| | | PLT-1151 Refactor more modals to React-Bootstrap | ||||
| * | | Moved show static methods out of modals and into EventHelpers | hmhealey | 2015-11-23 | 11 | -47/+42 |
| | | | |||||
| * | | Removed unused modal divs from channel.html | hmhealey | 2015-11-23 | 1 | -10/+1 |
| | | | |||||
| * | | Converted GetLinkModal to React-Bootstrap and added GetTeamInviteLinkModal | hmhealey | 2015-11-23 | 10 | -108/+163 |
| | | | |||||
| * | | Cleaned up how channel intro messages display set channel header button | hmhealey | 2015-11-23 | 1 | -28/+17 |
| | | | |||||
| * | | Renamed EditChannelModal to EditChannelHeaderModal | hmhealey | 2015-11-23 | 4 | -12/+12 |
| | | | |||||
| * | | Ported EditChannelModal to React-Bootstrap | hmhealey | 2015-11-23 | 7 | -187/+161 |
| | | | |||||
* | | | Merge pull request #1499 from mattermost/makefile-tweaks | Joram Wilander | 2015-11-23 | 2 | -5/+7 |
|\ \ \ | |/ / |/| | | Moving removal of data directory to nuke. Updating dev setup. | ||||
| * | | Moving removal of data directory to nuke. Updating dev setup. | Christopher Speller | 2015-11-23 | 2 | -5/+7 |
| | | | |||||
* | | | Merge pull request #1498 from mattermost/eslint-updates | Joram Wilander | 2015-11-23 | 2 | -5/+5 |
|\ \ \ | |/ / |/| | | ESLint updates. Enable no magic numbers as warning. Ignore stateless components. | ||||
| * | | Enable no magic numbers as warning. Ignore stateless components. | Christopher Speller | 2015-11-23 | 2 | -5/+5 |
|/ / | |||||
* | | Merge pull request #1475 from mattermost/plt-90 | Christopher Speller | 2015-11-23 | 29 | -657/+1301 |
|\ \ | | | | | | | PLT-90 PLT-88 PLT-1109 PLT-1167 Implementing Permalinks, Jump to post from search, Performace Improvements. | ||||
| * | | Implementing Permalinks and jumping to post from search. Performance | Christopher Speller | 2015-11-23 | 29 | -657/+1301 |
|/ / | | | | | | | improvements. | ||||
* | | Merge pull request #1496 from lindy65/patch-11 | Christopher Speller | 2015-11-23 | 1 | -8/+8 |
|\ \ | | | | | | | Update Team-Settings.md |