Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |||||
| * | 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 | |
|\ | | | | | Refactor remaining uses of getInitialState and componentWillMount | |||||
| * | Moved componentWillMount logic into the constructor of the react components ↵ | Reed Garmsen | 2015-09-02 | 2 | -9/+7 | |
| | | | | | | | | it was used in | |||||
| * | 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 | |||||
| * | | 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 | |||||
| * | | 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 | |||||
| * | | | 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 alignment issue with comments | |||||
| * | | | 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 | |||||
| * | | | 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 search to slip to end word of post | |||||
| * | | | 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 | |
|\ \ \ \ | |/ / / |/| | | | 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 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 | |||||
| * | | | | 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. | |||||
| * | | | 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 | |||||
| * | | 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. | |||||
| * | | 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 | |||||
| * | | 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 | |||||
| * | | | 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 | |||||
| * | | | 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. | |||||
| * | | Fix data not being passed into login success function. | JoramWilander | 2015-09-02 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #553 from mattermost/MM-2065 | Corey Hulen | 2015-09-02 | 21 | -602/+1240 | |
|\ \ | | | | | | | MM-2065 Cosmetic refactoring for ESLint | |||||
| * | | MM-2065 breaking seach_results into multiple files | =Corey Hulen | 2015-09-02 | 3 | -145/+239 | |
| | | | ||||||
| * | | MM-2065 style refactoring | =Corey Hulen | 2015-09-01 | 18 | -457/+1001 | |
| | | | ||||||
* | | | Merge pull request #547 from mattermost/mm-2068 | Corey Hulen | 2015-09-02 | 5 | -700/+812 | |
|\ \ \ | | | | | | | | | MM-2068 Cosmetic refactoring for ESLint | |||||
| * | | | Cosmetic refactoring for ESLint | Christopher Speller | 2015-09-02 | 5 | -700/+812 | |
| | | | | ||||||
* | | | | Merge pull request #545 from mattermost/mm-2066 | Corey Hulen | 2015-09-02 | 15 | -979/+1678 | |
|\ \ \ \ | | | | | | | | | | | MM-2066 Refactoring for style guide | |||||
| * | | | | Remove use of getDOMNode from multiple files. | JoramWilander | 2015-09-02 | 9 | -87/+72 | |
| | | | | | ||||||
| * | | | | Remove getDOMNode usage and self assign in access_modal_history.jsx | JoramWilander | 2015-09-02 | 1 | -5/+4 | |
| | | | | | ||||||
| * | | | | Changed imports to be upper case for multiple files. | JoramWilander | 2015-09-02 | 6 | -26/+26 | |
| | | | | | ||||||
| * | | | | Reformatted user_settings_appearance.jsx to meet style guide requirements. | JoramWilander | 2015-09-02 | 2 | -55/+112 | |
| | | | | | ||||||
| * | | | | Reformatted team_signup_allowed_domains_page.jsx to meet style guide ↵ | JoramWilander | 2015-09-02 | 1 | -23/+64 | |
| | | | | | | | | | | | | | | | | | | | | requirements. | |||||
| * | | | | Reformatted user_profile.jsx to meet style guide requirements. | JoramWilander | 2015-09-01 | 2 | -46/+62 | |
| | | | | | ||||||
| * | | | | Reformatted view_image.jsx to meet style guide requirements. | JoramWilander | 2015-09-01 | 1 | -78/+146 | |
| | | | | |