summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #401 from rgarmsen2295/mm-1875Harrison Healey2015-08-201-14/+54
|\ | | | | MM-1875 Url parameters are now removed after logging in
| * Additional cosmetic reformatting to meet new es6 requirementsReed Garmsen2015-08-191-18/+52
| |
| * Url parameters are now removed after logging inReed Garmsen2015-08-191-2/+8
| |
* | Merge pull request #412 from mattermost/sidebar-patchJoram Wilander2015-08-202-7/+7
|\ \ | | | | | | Fixing a few refactoring errors.
| * | Fixing a few refactoring errors.Christopher Speller2015-08-202-7/+7
| | |
* | | Merge pull request #406 from mattermost/mm-1281Christopher Speller2015-08-194-5/+23
|\ \ \ | | | | | | | | MM-1281 Track channel creator in DB and show in channel intro message
| * | | Track channel creator in DB and show in channel intro message.JoramWilander2015-08-194-5/+23
| | | |
* | | | Merge pull request #400 from nickago/MM-1829Christopher Speller2015-08-195-1187/+1245
|\ \ \ \ | |_|/ / |/| | | Mm 1829 Fixed edge case of stale data not being cleared from user settings display
| * | | Further cosmetic refactoringnickago2015-08-181-153/+176
| | | |
| * | | Cosmetic refactoringnickago2015-08-181-5/+11
| | | |
| * | | Clear state info on section changenickago2015-08-182-9/+13
| | | |
| * | | Split up user settings filesnickago2015-08-185-1182/+1207
| | | |
* | | | Merge pull request #394 from mattermost/mm-1410Joram Wilander2015-08-1916-805/+1428
|\ \ \ \ | | | | | | | | | | MM-1410 Initial implementaiton of import from Slack
| * | | | Requiring team admin to import and fixing a few style issuesChristopher Speller2015-08-193-9/+5
| | | | |
| * | | | Cosmetic refactoring for ESLintChristopher Speller2015-08-199-877/+952
| | | | |
| * | | | Implemention of slack import feature.Christopher Speller2015-08-1911-4/+556
| | |/ / | |/| |
* | | | Merge pull request #408 from mattermost/mm-1937Corey Hulen2015-08-191-0/+43
|\ \ \ \ | |_|_|/ |/| | | MM-1937 New README for dockerhub
| * | | New README for dockerhubChristopher Speller2015-08-191-0/+43
| | | |
* | | | Merge pull request #398 from mattermost/mm-1593Joram Wilander2015-08-195-18/+59
|\ \ \ \ | | | | | | | | | | MM-1593 Added a message deleted indicator
| * | | | Added a message deleted indicator when a post is deleted to let the user ↵JoramWilander2015-08-195-18/+59
| |/ / / | | | | | | | | | | | | know what's happening.
* | | | Merge pull request #397 from mattermost/mm-1962Harrison Healey2015-08-191-1/+1
|\ \ \ \ | | | | | | | | | | Fixes mm-1962 verify email redirect now works correctly
| * | | | Fixes mm-1962 verify email redirect now works correctly=Corey Hulen2015-08-181-1/+1
| | | | |
* | | | | Merge pull request #407 from mattermost/mm-1976Christopher Speller2015-08-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | MM-1976 Fixes new message indicator not appearing
| * | | | | Fixes new message indicator not appearing.JoramWilander2015-08-191-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #403 from jirkah/startsslChristopher Speller2015-08-196-1/+12
|\ \ \ \ \ | |_|_|/ / |/| | | | Add support for SMTP servers with StartTLS
| * | | | Add support for SMTP servers with StartTLSJirka Hlavacek2015-08-196-1/+12
| |/ / /
* | | | Merge pull request #399 from mattermost/update-dependenciesJoram Wilander2015-08-194-188/+296
|\ \ \ \ | |/ / / |/| | | MM-1908 Update dependencies and switch to Babelify
| * | | Refacting post_info.jsx to be an example for ES6 class syntaxChristopher Speller2015-08-182-41/+129
| | | |
| * | | Updating dependencies and blacklisting strict from babelify for now.Christopher Speller2015-08-182-147/+167
| | | | | | | | | | | | | | | | Also updating .eslintrc for new version of ESLint.
* | | | Merge pull request #387 from rgarmsen2295/mm-1733Corey Hulen2015-08-189-723/+811
|\ \ \ \ | | | | | | | | | | MM-1733 Team URLs no longer accept a number as the first character
| * | | | Renamed new component files for easier identificationReed Garmsen2015-08-189-16/+16
| | | | |
| * | | | Refactors the signup_team_complete.jsx file into multiple files for each ↵Reed Garmsen2015-08-179-759/+805
| | | | | | | | | | | | | | | | | | | | component, rather than have all components put in one file
| * | | | Initial cosmetic reformatting of signup_team_complete.jsx fileReed Garmsen2015-08-171-41/+83
| | | | |
| * | | | Team URLs no longer accept a number as the first character; updated error ↵Reed Garmsen2015-08-171-2/+2
| | | | | | | | | | | | | | | | | | | | message on URL compliance failure
* | | | | Merge pull request #383 from rgarmsen2295/mm-1584bCorey Hulen2015-08-185-52/+152
|\ \ \ \ \ | |_|/ / / |/| | | | 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 issuesReed Garmsen2015-08-185-40/+72
| | | | |
| * | | | Prepatory cosmetic refactoring of more_direct_channels.jsxReed Garmsen2015-08-181-28/+38
| | | | |
| * | | | Cosmetic reformatting of sidebar.jsxReed Garmsen2015-08-181-20/+22
| | | | |
| * | | | Private message channels no longer refresh on creation/first useReed Garmsen2015-08-183-6/+62
| | | | |
* | | | | Merge pull request #395 from mattermost/merge-fixJoram Wilander2015-08-181-6/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix a bad merge that had edited posts being handled sloppily.
| * | | | Fix a bad merge that had edited posts being handled sloppily.JoramWilander2015-08-181-6/+0
| | | | |
* | | | | Merge pull request #375 from nickago/MM-1777Christopher Speller2015-08-182-2/+6
|\ \ \ \ \ | | | | | | | | | | | | MM-1777 Formatted comments' time in RHS similar to root
| * | | | | Formatted comments' time in RHS similar to rootnickago2015-08-182-2/+6
| | |_|_|/ | |/| | |
* | | | | Merge pull request #390 from rgarmsen2295/mm-1802Corey Hulen2015-08-182-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 Garmsen2015-08-171-16/+14
| | | | | | | | | | | | | | | | | | | | (like desktop mode)
| * | | | Refactored the NotifyCounts component out of the navbar.jsx file into its ↵Reed Garmsen2015-08-172-44/+50
| | | | | | | | | | | | | | | | | | | | own file
| * | | | Initial prepatory cosmetic reformatting of navbar.jsxReed Garmsen2015-08-171-116/+129
| | |_|/ | |/| |
* | | | Merge pull request #389 from nickago/MM-1799Joram Wilander2015-08-181-1/+5
|\ \ \ \ | |_|/ / |/| | | MM-1799 Changed wording of get link modal
| * | | Changed wording of get link modalnickago2015-08-171-1/+5
| |/ /
* | | Merge pull request #392 from hmhealey/typingfixJoram Wilander2015-08-181-1/+1
|\ \ \ | |_|/ |/| | Fixed 'X is typing...' messages being malformed when sent to the server