summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename STYLE-GUIDE.md to doc/developer/style-guide.mdit332015-09-021-0/+0
|
* Merge pull request #575 from mattermost/it33-patch-12it332015-09-021-0/+871
|\ | | | | Consolidating licensing info into LICENSE.txt
| * Consolidating licensing info into LICENSE.txtit332015-09-021-0/+871
| |
* | Merge pull request #573 from mattermost/it33-patch-10it332015-09-021-0/+0
|\ \ | | | | | | Rename scripts/README_DEV.md to doc/install/dev-setup.md
| * | Rename scripts/README_DEV.md to doc/install/dev-setup.mdit332015-09-021-0/+0
| |/
* | Merge pull request #572 from mattermost/it33-patch-9it332015-09-021-0/+8
|\ \ | |/ |/| Updating table of contents for doc
| * Updating table of contents for docit332015-09-021-0/+8
|/
* Merge pull request #571 from mishimi/patch-3Joram Wilander2015-09-021-1/+1
|\ | | | | Updating help text to fix typo
| * Updating help text to fix typomishimi2015-09-021-1/+1
|/
* Merge pull request #570 from rgarmsen2295/fix-initial-state-callsCorey Hulen2015-09-025-22/+30
|\ | | | | Refactor remaining uses of getInitialState and componentWillMount
| * Moved componentWillMount logic into the constructor of the react components ↵Reed Garmsen2015-09-022-9/+7
| | | | | | | | it was used in
| * Replaced remaining calls of getInitialStateReed Garmsen2015-09-023-13/+23
| |
* | Merge pull request #561 from mishimi/patch-2Corey Hulen2015-09-021-1/+1
|\ \ | | | | | | MM-2102 Clarifying error message on reserved URL words
| * | MM-2102 Clarifying error message on reserved URL wordsmishimi2015-09-021-1/+1
| | |
* | | Merge pull request #554 from lfbrock/patch-2Corey Hulen2015-09-021-0/+459
|\ \ \ | |_|/ |/| | Update NOTICE.txt to include jquery-dragster and twemoji
| * | Update NOTICE.txt to include jquery-dragster and twemojilfbrock2015-09-021-0/+459
| | |
* | | Merge pull request #569 from rgarmsen2295/fix-react-key-warningsCorey Hulen2015-09-027-9/+34
|\ \ \ | | | | | | | | Fixed some react warnings involving missing keys in render arrays
| * | | Fixed some react warnings involving missing keys in render arraysReed Garmsen2015-09-027-9/+34
|/ / /
* | | Merge pull request #568 from rgarmsen2295/fix-no-prof-pic-issueCorey Hulen2015-09-021-1/+1
|\ \ \ | | | | | | | | Fixed alignment issue with comments
| * | | Fixed issue of missing empty, placeholder profile image for commentsReed Garmsen2015-09-021-1/+1
|/ / /
* | | Merge pull request #567 from mattermost/fix-styleJoram Wilander2015-09-021-39/+21
|\ \ \ | | | | | | | | Fixing style
| * | | Fixing style=Corey Hulen2015-09-021-39/+21
|/ / /
* | | Merge pull request #566 from nickago/hotfixCorey Hulen2015-09-021-1/+1
|\ \ \ | | | | | | | | fixed bug in function binding causing search to slip to end word of post
| * | | fixed bug in function binding causing trimWord to slip to end word of postnickago2015-09-021-1/+1
| | | |
* | | | Merge pull request #565 from mattermost/mm-2081Corey Hulen2015-09-0231-58/+90
|\ \ \ \ | |/ / / |/| | | MM-2081 Moving config.js to /web/react/utils/ Including in every file needed
| * | | Moving config.js to /web/react/utils/ Including in every file neededChristopher Speller2015-09-0231-58/+90
| | | |
* | | | Merge pull request #564 from hmhealey/memberlistJoram Wilander2015-09-021-2/+2
|\ \ \ \ | | | | | | | | | | Fixed ability to manage channel members after style guide refactoring
| * | | | Fixed ability to manage channel members after style guide refactoringhmhealey2015-09-021-2/+2
|/ / / /
* | | | Merge pull request #563 from mattermost/minor-fixJoram Wilander2015-09-021-3/+3
|\ \ \ \ | |/ / / |/| | | Fix missed binds.
| * | | Fix missed binds.JoramWilander2015-09-021-3/+3
|/ / /
* | | Merge pull request #562 from nickago/hotfixCorey Hulen2015-09-021-3/+6
|\ \ \ | |_|/ |/| | bound handleClickImage function
| * | bound handleClickImage functionnickago2015-09-021-3/+6
|/ /
* | Fixing minor issue=Corey Hulen2015-09-021-1/+1
| |
* | Merge pull request #560 from mattermost/minor-fixJoram Wilander2015-09-021-1/+1
|\ \ | | | | | | Fix bad syntax.
| * | Fix bad syntax.JoramWilander2015-09-021-1/+1
|/ /
* | Merge pull request #559 from hmhealey/getdomnodeCorey Hulen2015-09-0211-33/+33
|\ \ | | | | | | Replaced broken remaining calls to getDOMNode with React.findDOMNode
| * | Replaced broken remaining calls to getDOMNode with React.findDOMNodehmhealey2015-09-0211-33/+33
| | |
* | | Merge pull request #558 from nickago/hotfixCorey Hulen2015-09-021-0/+1
|\ \ \ | | | | | | | | Bound on change function to react componenet
| * | | Bound on change function to react componenetnickago2015-09-021-0/+1
| |/ /
* | | Merge pull request #557 from mattermost/file-attachment-fixCorey Hulen2015-09-021-1/+2
|\ \ \ | | | | | | | | Fixing style issue in file_attachment.jsx
| * | | Fixing style issue in file_attachment.jsxChristopher Speller2015-09-021-1/+2
| |/ /
* | | Merge pull request #556 from mattermost/password-page-fixCorey Hulen2015-09-021-1/+1
|\ \ \ | |/ / |/| | Fix data not being passed into login success function.
| * | Fix data not being passed into login success function.JoramWilander2015-09-021-1/+1
|/ /
* | Merge pull request #553 from mattermost/MM-2065Corey Hulen2015-09-0221-602/+1240
|\ \ | | | | | | MM-2065 Cosmetic refactoring for ESLint
| * | MM-2065 breaking seach_results into multiple files=Corey Hulen2015-09-023-145/+239
| | |
| * | MM-2065 style refactoring=Corey Hulen2015-09-0118-457/+1001
| | |
* | | Merge pull request #547 from mattermost/mm-2068Corey Hulen2015-09-025-700/+812
|\ \ \ | | | | | | | | MM-2068 Cosmetic refactoring for ESLint
| * | | Cosmetic refactoring for ESLintChristopher Speller2015-09-025-700/+812
| | | |
* | | | Merge pull request #545 from mattermost/mm-2066Corey Hulen2015-09-0215-979/+1678
|\ \ \ \ | | | | | | | | | | MM-2066 Refactoring for style guide
| * | | | Remove use of getDOMNode from multiple files.JoramWilander2015-09-029-87/+72
| | | | |