Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Fixing merge | =Corey Hulen | 2015-09-02 | 6 | -665/+879 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #579 from mattermost/it33-patch-10 | it33 | 2015-09-02 | 1 | -0/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | Rename STYLE-GUIDE.md to doc/developer/style-guide.md | it33 | 2015-09-02 | 1 | -0/+0 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #577 from mattermost/it33-patch-16 | it33 | 2015-09-02 | 2 | -665/+0 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fixing build | =Corey Hulen | 2015-09-02 | 1 | -1/+0 | |
| * | | | | Consolidating licensing info into LICENSE.txt | it33 | 2015-09-02 | 1 | -664/+0 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #575 from mattermost/it33-patch-12 | it33 | 2015-09-02 | 1 | -0/+871 | |
|\ \ \ \ | ||||||
| * | | | | Consolidating licensing info into LICENSE.txt | it33 | 2015-09-02 | 1 | -0/+871 | |
| |/ / / | ||||||
* | | | | Merge pull request #573 from mattermost/it33-patch-10 | it33 | 2015-09-02 | 1 | -0/+0 | |
|\ \ \ \ | ||||||
| * | | | | Rename scripts/README_DEV.md to doc/install/dev-setup.md | it33 | 2015-09-02 | 1 | -0/+0 | |
| |/ / / | ||||||
* | | | | Merge pull request #572 from mattermost/it33-patch-9 | it33 | 2015-09-02 | 1 | -0/+8 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Updating table of contents for doc | it33 | 2015-09-02 | 1 | -0/+8 | |
|/ / / | ||||||
| * | | Fixing build | =Corey Hulen | 2015-09-02 | 1 | -1/+0 | |
| * | | Consolidating licensing info into LICENSE.txt | it33 | 2015-09-02 | 1 | -202/+0 | |
|/ / | ||||||
* | | Merge pull request #571 from mishimi/patch-3 | Joram Wilander | 2015-09-02 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Updating help text to fix typo | mishimi | 2015-09-02 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #570 from rgarmsen2295/fix-initial-state-calls | Corey Hulen | 2015-09-02 | 5 | -22/+30 | |
|\ \ | ||||||
| * | | Moved componentWillMount logic into the constructor of the react components i... | Reed Garmsen | 2015-09-02 | 2 | -9/+7 | |
| * | | Replaced remaining calls of getInitialState | Reed Garmsen | 2015-09-02 | 3 | -13/+23 | |
* | | | Merge pull request #561 from mishimi/patch-2 | Corey Hulen | 2015-09-02 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | MM-2102 Clarifying error message on reserved URL words | mishimi | 2015-09-02 | 1 | -1/+1 | |
* | | | | Merge pull request #554 from lfbrock/patch-2 | Corey Hulen | 2015-09-02 | 1 | -0/+459 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Update NOTICE.txt to include jquery-dragster and twemoji | lfbrock | 2015-09-02 | 1 | -0/+459 | |
* | | | | Merge pull request #569 from rgarmsen2295/fix-react-key-warnings | Corey Hulen | 2015-09-02 | 7 | -9/+34 | |
|\ \ \ \ | ||||||
| * | | | | Fixed some react warnings involving missing keys in render arrays | Reed Garmsen | 2015-09-02 | 7 | -9/+34 | |
|/ / / / | ||||||
* | | | | Merge pull request #568 from rgarmsen2295/fix-no-prof-pic-issue | Corey Hulen | 2015-09-02 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fixed issue of missing empty, placeholder profile image for comments | Reed Garmsen | 2015-09-02 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #567 from mattermost/fix-style | Joram Wilander | 2015-09-02 | 1 | -39/+21 | |
|\ \ \ \ | ||||||
| * | | | | Fixing style | =Corey Hulen | 2015-09-02 | 1 | -39/+21 | |
|/ / / / | ||||||
* | | | | Merge pull request #566 from nickago/hotfix | Corey Hulen | 2015-09-02 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | fixed bug in function binding causing trimWord to slip to end word of post | nickago | 2015-09-02 | 1 | -1/+1 | |
* | | | | | Merge pull request #565 from mattermost/mm-2081 | Corey Hulen | 2015-09-02 | 31 | -58/+90 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Moving config.js to /web/react/utils/ Including in every file needed | Christopher Speller | 2015-09-02 | 31 | -58/+90 | |
* | | | | | Merge pull request #564 from hmhealey/memberlist | Joram Wilander | 2015-09-02 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fixed ability to manage channel members after style guide refactoring | hmhealey | 2015-09-02 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #563 from mattermost/minor-fix | Joram Wilander | 2015-09-02 | 1 | -3/+3 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix missed binds. | JoramWilander | 2015-09-02 | 1 | -3/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #562 from nickago/hotfix | Corey Hulen | 2015-09-02 | 1 | -3/+6 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | bound handleClickImage function | nickago | 2015-09-02 | 1 | -3/+6 | |
|/ / / | ||||||
* | | | Fixing minor issue | =Corey Hulen | 2015-09-02 | 1 | -1/+1 | |
* | | | Merge pull request #560 from mattermost/minor-fix | Joram Wilander | 2015-09-02 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Fix bad syntax. | JoramWilander | 2015-09-02 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #559 from hmhealey/getdomnode | Corey Hulen | 2015-09-02 | 11 | -33/+33 | |
|\ \ \ | ||||||
| * | | | Replaced broken remaining calls to getDOMNode with React.findDOMNode | hmhealey | 2015-09-02 | 11 | -33/+33 | |
* | | | | Merge pull request #558 from nickago/hotfix | Corey Hulen | 2015-09-02 | 1 | -0/+1 | |
|\ \ \ \ | ||||||
| * | | | | Bound on change function to react componenet | nickago | 2015-09-02 | 1 | -0/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #557 from mattermost/file-attachment-fix | Corey Hulen | 2015-09-02 | 1 | -1/+2 | |
|\ \ \ \ | ||||||
| * | | | | Fixing style issue in file_attachment.jsx | Christopher Speller | 2015-09-02 | 1 | -1/+2 | |
| |/ / / | ||||||
* | | | | Merge pull request #556 from mattermost/password-page-fix | Corey Hulen | 2015-09-02 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fix data not being passed into login success function. | JoramWilander | 2015-09-02 | 1 | -1/+1 | |
|/ / / |