Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #414 from mattermost/update-etag-version | Christopher Speller | 2015-08-20 | 1 | -1/+1 |
|\ | | | | | Update etag version for the addition of CreatorId field to channels | ||||
| * | Update etag version for the addition of CreatorId field to channels | JoramWilander | 2015-08-20 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #401 from rgarmsen2295/mm-1875 | Harrison Healey | 2015-08-20 | 1 | -14/+54 |
|\ \ | | | | | | | MM-1875 Url parameters are now removed after logging in | ||||
| * | | Additional cosmetic reformatting to meet new es6 requirements | Reed Garmsen | 2015-08-19 | 1 | -18/+52 |
| | | | |||||
| * | | Url parameters are now removed after logging in | Reed Garmsen | 2015-08-19 | 1 | -2/+8 |
| | | | |||||
* | | | Merge pull request #412 from mattermost/sidebar-patch | Joram Wilander | 2015-08-20 | 2 | -7/+7 |
|\ \ \ | |_|/ |/| | | Fixing a few refactoring errors. | ||||
| * | | Fixing a few refactoring errors. | Christopher Speller | 2015-08-20 | 2 | -7/+7 |
| | | | |||||
* | | | Merge pull request #406 from mattermost/mm-1281 | Christopher Speller | 2015-08-19 | 1 | -5/+14 |
|\ \ \ | | | | | | | | | MM-1281 Track channel creator in DB and show in channel intro message | ||||
| * | | | Track channel creator in DB and show in channel intro message. | JoramWilander | 2015-08-19 | 1 | -5/+14 |
| | | | | |||||
* | | | | Merge pull request #400 from nickago/MM-1829 | Christopher Speller | 2015-08-19 | 5 | -1187/+1245 |
|\ \ \ \ | |_|/ / |/| | | | Mm 1829 Fixed edge case of stale data not being cleared from user settings display | ||||
| * | | | Further cosmetic refactoring | nickago | 2015-08-18 | 1 | -153/+176 |
| | | | | |||||
| * | | | Cosmetic refactoring | nickago | 2015-08-18 | 1 | -5/+11 |
| | | | | |||||
| * | | | Clear state info on section change | nickago | 2015-08-18 | 2 | -9/+13 |
| | | | | |||||
| * | | | Split up user settings files | nickago | 2015-08-18 | 5 | -1182/+1207 |
| | | | | |||||
* | | | | Merge pull request #394 from mattermost/mm-1410 | Joram Wilander | 2015-08-19 | 9 | -798/+1047 |
|\ \ \ \ | |_|_|/ |/| | | | MM-1410 Initial implementaiton of import from Slack | ||||
| * | | | Requiring team admin to import and fixing a few style issues | Christopher Speller | 2015-08-19 | 1 | -2/+1 |
| | | | | |||||
| * | | | Cosmetic refactoring for ESLint | Christopher Speller | 2015-08-19 | 8 | -873/+948 |
| | | | | |||||
| * | | | Implemention of slack import feature. | Christopher Speller | 2015-08-19 | 5 | -1/+176 |
| | |/ | |/| | |||||
* | | | Merge pull request #398 from mattermost/mm-1593 | Joram Wilander | 2015-08-19 | 4 | -16/+58 |
|\ \ \ | | | | | | | | | MM-1593 Added a message deleted indicator | ||||
| * | | | Added a message deleted indicator when a post is deleted to let the user ↵ | JoramWilander | 2015-08-19 | 4 | -16/+58 |
| | | | | | | | | | | | | | | | | know what's happening. | ||||
* | | | | Merge pull request #397 from mattermost/mm-1962 | Harrison Healey | 2015-08-19 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fixes mm-1962 verify email redirect now works correctly | ||||
| * | | | | Fixes mm-1962 verify email redirect now works correctly | =Corey Hulen | 2015-08-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #407 from mattermost/mm-1976 | Christopher Speller | 2015-08-19 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | MM-1976 Fixes new message indicator not appearing | ||||
| * | | | | Fixes new message indicator not appearing. | JoramWilander | 2015-08-19 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #399 from mattermost/update-dependencies | Joram Wilander | 2015-08-19 | 4 | -188/+296 |
|\ \ \ \ | |/ / / |/| | | | MM-1908 Update dependencies and switch to Babelify | ||||
| * | | | Refacting post_info.jsx to be an example for ES6 class syntax | Christopher Speller | 2015-08-18 | 2 | -41/+129 |
| | | | | |||||
| * | | | Updating dependencies and blacklisting strict from babelify for now. | Christopher Speller | 2015-08-18 | 2 | -147/+167 |
| | | | | | | | | | | | | | | | | Also updating .eslintrc for new version of ESLint. | ||||
* | | | | Merge pull request #387 from rgarmsen2295/mm-1733 | Corey Hulen | 2015-08-18 | 9 | -723/+811 |
|\ \ \ \ | | | | | | | | | | | MM-1733 Team URLs no longer accept a number as the first character | ||||
| * | | | | Renamed new component files for easier identification | Reed Garmsen | 2015-08-18 | 9 | -16/+16 |
| | | | | | |||||
| * | | | | Refactors the signup_team_complete.jsx file into multiple files for each ↵ | Reed Garmsen | 2015-08-17 | 9 | -759/+805 |
| | | | | | | | | | | | | | | | | | | | | component, rather than have all components put in one file | ||||
| * | | | | Initial cosmetic reformatting of signup_team_complete.jsx file | Reed Garmsen | 2015-08-17 | 1 | -41/+83 |
| | | | | | |||||
| * | | | | Team URLs no longer accept a number as the first character; updated error ↵ | Reed Garmsen | 2015-08-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | message on URL compliance failure | ||||
* | | | | | Merge pull request #383 from rgarmsen2295/mm-1584b | Corey Hulen | 2015-08-18 | 4 | -52/+146 |
|\ \ \ \ \ | |_|/ / / |/| | | | | MM-1584 Private message channels no longer do a page refresh on creation/first use | ||||
| * | | | | Added feature to the 'More...' PM channel list and fixed small cosmetic issues | Reed Garmsen | 2015-08-18 | 4 | -40/+71 |
| | | | | | |||||
| * | | | | Prepatory cosmetic refactoring of more_direct_channels.jsx | Reed Garmsen | 2015-08-18 | 1 | -28/+38 |
| | | | | | |||||
| * | | | | Cosmetic reformatting of sidebar.jsx | Reed Garmsen | 2015-08-18 | 1 | -20/+22 |
| | | | | | |||||
| * | | | | Private message channels no longer refresh on creation/first use | Reed Garmsen | 2015-08-18 | 2 | -6/+57 |
| | | | | | |||||
* | | | | | Merge pull request #395 from mattermost/merge-fix | Joram Wilander | 2015-08-18 | 1 | -6/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix a bad merge that had edited posts being handled sloppily. | ||||
| * | | | | Fix a bad merge that had edited posts being handled sloppily. | JoramWilander | 2015-08-18 | 1 | -6/+0 |
| | | | | | |||||
* | | | | | Merge pull request #375 from nickago/MM-1777 | Christopher Speller | 2015-08-18 | 2 | -2/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1777 Formatted comments' time in RHS similar to root | ||||
| * | | | | | Formatted comments' time in RHS similar to root | nickago | 2015-08-18 | 2 | -2/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #390 from rgarmsen2295/mm-1802 | Corey Hulen | 2015-08-18 | 2 | -152/+169 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | MM-1802 Clicking on a PM channel name in mobile view now opens the channel menu | ||||
| * | | | | Clicking on a PM channel name in mobile view now opens the channel menu ↵ | Reed Garmsen | 2015-08-17 | 1 | -16/+14 |
| | | | | | | | | | | | | | | | | | | | | (like desktop mode) | ||||
| * | | | | Refactored the NotifyCounts component out of the navbar.jsx file into its ↵ | Reed Garmsen | 2015-08-17 | 2 | -44/+50 |
| | | | | | | | | | | | | | | | | | | | | own file | ||||
| * | | | | Initial prepatory cosmetic reformatting of navbar.jsx | Reed Garmsen | 2015-08-17 | 1 | -116/+129 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #389 from nickago/MM-1799 | Joram Wilander | 2015-08-18 | 1 | -1/+5 |
|\ \ \ \ | |_|/ / |/| | | | MM-1799 Changed wording of get link modal | ||||
| * | | | Changed wording of get link modal | nickago | 2015-08-17 | 1 | -1/+5 |
| |/ / | |||||
* | / | Fixed 'X is typing...' messages being malformed when sent to the server | hmhealey | 2015-08-18 | 1 | -1/+1 |
| |/ |/| | |||||
* | | reformat post_list.jsx to match style guide more closely | JoramWilander | 2015-08-18 | 1 | -185/+227 |
| | | |||||
* | | reformatted post_right to match style guide more closely | JoramWilander | 2015-08-18 | 1 | -55/+61 |
| | |