summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #586 from hmhealey/mm1871Joram Wilander2015-09-031-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 largehmhealey2015-09-031-57/+31
|/
* Merge pull request #582 from mattermost/it33-patch-1Joram Wilander2015-09-031-1/+1
|\ | | | | Update README.md
| * Update README.mdit332015-09-031-1/+1
| |
* | Merge pull request #583 from mattermost/fixing-buildCorey Hulen2015-09-031-2/+0
|\ \ | |/ |/| Fixing Makefile
| * Fixing Makefile=Corey Hulen2015-09-031-2/+0
|/
* Merge pull request #581 from mattermost/it33-patch-1it332015-09-031-4/+4
|\ | | | | Formatting updates
| * Formatting updatesit332015-09-021-4/+4
|/
* Merge pull request #580 from mattermost/it33-patch-12it332015-09-021-13/+23
|\ | | | | Update README.md
| * Update README.mdit332015-09-021-13/+23
| |
* | Merge pull request #576 from mattermost/it33-patch-15Corey Hulen2015-09-022-203/+0
|\ \ | | | | | | Consolidating licensing info into LICENSE.txt
| * \ Fixing merge=Corey Hulen2015-09-026-665/+879
| |\ \ | |/ / |/| |
* | | Merge pull request #579 from mattermost/it33-patch-10it332015-09-021-0/+0
|\ \ \ | | | | | | | | Rename STYLE-GUIDE.md to doc/developer/style-guide.md
| * | | Rename STYLE-GUIDE.md to doc/developer/style-guide.mdit332015-09-021-0/+0
| | |/ | |/|
* | | Merge pull request #577 from mattermost/it33-patch-16it332015-09-022-665/+0
|\ \ \ | |/ / |/| | Consolidating licensing info into LICENSE.txt
| * | Fixing build=Corey Hulen2015-09-021-1/+0
| | |
| * | Consolidating licensing info into LICENSE.txtit332015-09-021-664/+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
|/ /
| * Fixing build=Corey Hulen2015-09-021-1/+0
| |
| * Consolidating licensing info into LICENSE.txtit332015-09-021-202/+0
|/
* 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
|/ /
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 15:04:57 +0000