Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #585 from mattermost/plt-37 | Christopher Speller | 2015-09-03 | 2 | -8/+9 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-37 Fix poor typing performance on iOS devices. | |||||
| * | | | | | Fix poor typing performance on iOS devices. | JoramWilander | 2015-09-03 | 2 | -8/+9 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #587 from nickago/MM-1899 | Christopher Speller | 2015-09-03 | 3 | -14/+10 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | MM-1899 Added help text to channel notifications | |||||
| * | | | | | Added help text to channel notifications | nickago | 2015-09-03 | 3 | -14/+10 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #588 from hmhealey/mm1852 | Harrison Healey | 2015-09-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | MM-1852 Fixed hashtag regex to only look for words starting with a # | |||||
| * | | | | | MM-1852 Fixed hashtag regex so that it only looks for hashtags starting with a # | hmhealey | 2015-09-03 | 1 | -1/+1 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #584 from mattermost/mm-1909 | Corey Hulen | 2015-09-03 | 2 | -9/+7 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | MM-1909 Enabling checking of style guide on travis and turning on strict mode | |||||
| * | | | | Enabling checking of style guide on travis and turning on strict mode | Christopher Speller | 2015-09-03 | 2 | -9/+7 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #586 from hmhealey/mm1871 | Joram Wilander | 2015-09-03 | 1 | -57/+31 | |
|\ \ \ \ | |_|/ / |/| | | | MM-1871 Fixed file uploads to still upload other files when one is too large | |||||
| * | | | Fixed file uploads to still upload other files when one is too large | hmhealey | 2015-09-03 | 1 | -57/+31 | |
|/ / / | ||||||
* | | | Merge pull request #582 from mattermost/it33-patch-1 | Joram Wilander | 2015-09-03 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Update README.md | |||||
| * | | | Update README.md | it33 | 2015-09-03 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #583 from mattermost/fixing-build | Corey Hulen | 2015-09-03 | 1 | -2/+0 | |
|\ \ \ \ | |/ / / |/| | | | Fixing Makefile | |||||
| * | | | Fixing Makefile | =Corey Hulen | 2015-09-03 | 1 | -2/+0 | |
|/ / / | ||||||
* | | | Merge pull request #581 from mattermost/it33-patch-1 | it33 | 2015-09-03 | 1 | -4/+4 | |
|\ \ \ | | | | | | | | | Formatting updates | |||||
| * | | | Formatting updates | it33 | 2015-09-02 | 1 | -4/+4 | |
|/ / / | ||||||
* | | | Merge pull request #580 from mattermost/it33-patch-12 | it33 | 2015-09-02 | 1 | -13/+23 | |
|\ \ \ | | | | | | | | | Update README.md | |||||
| * | | | Update README.md | it33 | 2015-09-02 | 1 | -13/+23 | |
| | | | | ||||||
* | | | | Merge pull request #576 from mattermost/it33-patch-15 | Corey Hulen | 2015-09-02 | 2 | -203/+0 | |
|\ \ \ \ | | | | | | | | | | | Consolidating licensing info into LICENSE.txt | |||||
| * \ \ \ | 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 | |||||
| * | | | | | 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 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Consolidating licensing info into LICENSE.txt | |||||
| * | | | | 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 | |||||
| * | | | | 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 | |||||
| * | | | | 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 | |||||
| * | | | 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 | |||||
| * | | 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 | |
| | | | | |