summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Removed underscores surrounding formatting tokens since they won't work with ↵hmhealey2015-09-191-8/+8
| | | | markdown
* Removed unnecessary conversion of newlines to html line breakshmhealey2015-09-191-6/+4
|
* Merge pull request #720 from mattermost/it33-patch-4Corey Hulen2015-09-181-1/+1
|\ | | | | Adjusting description of emoji codes feature
| * Adjusting description of emoji codes featureit332015-09-181-1/+1
| |
* | Merge pull request #709 from mattermost/PLT-11Harrison Healey2015-09-1828-531/+993
|\ \ | | | | | | PLT-11 adding config for logs to UI
| * \ merging=Corey Hulen2015-09-1822-27/+515
| |\ \
| * \ \ fixing merge=Corey Hulen2015-09-185-10/+19
| |\ \ \
| * | | | Moving logout item=Corey Hulen2015-09-171-6/+6
| | | | |
| * | | | PLT-11 adding config for logs to UI=Corey Hulen2015-09-1717-293/+208
| | | | |
| * | | | PLT-11 Adding ability to save config file=Corey Hulen2015-09-1714-295/+842
| | | | |
* | | | | Merge pull request #718 from mattermost/it33-patch-3Corey Hulen2015-09-181-2/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | Adding build status indicator to README.md
| * | | | Adding build status indicator to README.mdit332015-09-181-2/+4
| | | | |
* | | | | Merge pull request #719 from lfbrock/patch-8it332015-09-181-2/+17
|\ \ \ \ \ | |/ / / / |/| | | | Updated changlog to include new contributors and features
| * | | | Updated changlog to include new contributors and featureslfbrock2015-09-181-2/+17
|/ / / /
* | | | Merge pull request #717 from mattermost/fix-loadtestCorey Hulen2015-09-182-3/+4
|\ \ \ \ | |_|_|/ |/| | | Fix authentication for server load tests.
| * | | Fix authentication for loadtests.JoramWilander2015-09-182-3/+4
| | |/ | |/|
* | | Merge pull request #699 from mattermost/PLT-92Joram Wilander2015-09-1821-28/+500
|\ \ \ | | | | | | | | PLT-92 Adding server side versioning to the binary
| * | | moving to security tab=Corey Hulen2015-09-172-12/+11
| | | |
| * | | fixing versioning=Corey Hulen2015-09-171-3/+3
| | | |
| * | | Making changes to versioning=Corey Hulen2015-09-1713-69/+86
| | | |
| * | | Merge branch 'master' into PLT-92=Corey Hulen2015-09-17973-55/+89408
| |\ \ \
| * | | | Fixing postgres issue and bumping version number=Corey Hulen2015-09-162-3/+50
| | | | |
| * | | | Adding version to UI=Corey Hulen2015-09-162-1/+13
| | | | |
| * | | | Adding database schema version=Corey Hulen2015-09-167-3/+222
| | | | |
| * | | | Outputing version to logs on server start=Corey Hulen2015-09-161-0/+1
| | | | |
| * | | | fixing build=Corey Hulen2015-09-162-1/+2
| | | | |
| * | | | PLT-92 Adding server side versioning to the binary=Corey Hulen2015-09-1613-23/+199
| | | | |
* | | | | Merge pull request #716 from hmhealey/plt299Corey Hulen2015-09-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | PLT-299 Fixed incorrect check if a url starts with an explicit protocol
| * | | | | Fixed incorrect check if a url starts with an explicit protocolhmhealey2015-09-181-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #714 from mattermost/test-matrixCorey Hulen2015-09-182-0/+16
|\ \ \ \ \ | |/ / / / |/| | | | Adding go 1.5.1 and postgress to travis build
| * | | | Adding go 1.5.1 and postgress to travis buildChristopher Speller2015-09-182-0/+16
| | | | |
* | | | | Merge pull request #713 from mattermost/it33-patch-3Christopher Speller2015-09-181-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | Adding template for contributor list request
| * | | | Adding template for contributor list requestit332015-09-181-1/+6
| | | | |
* | | | | Merge pull request #712 from mattermost/postgres-oauth-fixChristopher Speller2015-09-181-0/+4
|\ \ \ \ \ | |/ / / / |/| | | | With Postgres return false when checking if column exists, if the table does not exist.
| * | | | Return false when checking if column exists, if the table does not exist ↵JoramWilander2015-09-181-0/+4
|/ / / / | | | | | | | | | | | | with postgres.
* | | | Merge pull request #665 from chengweiv5/fix-coding-styleChristopher Speller2015-09-184-10/+10
|\ \ \ \ | |_|_|/ |/| | | Fix coding style: replace tab with whitespace in mattermost config
| * | | Fix coding style: replace tab with whitespace in mattermost configChengwei Yang2015-09-134-10/+10
| | | | | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* | | | Merge pull request #705 from esethna/patch-1Corey Hulen2015-09-171-1/+1
|\ \ \ \ | | | | | | | | | | Grammar change to New Channel ui text
| * | | | Grammar change to New Channel ui textesethna2015-09-171-1/+1
| | | | |
* | | | | Merge pull request #706 from lindy65/patch-2Joram Wilander2015-09-171-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fixing URL for "Developer Machine Setup"
| * | | | Fixing URL for "Developer Machine Setup"lindy652015-09-171-1/+1
|/ / / / | | | | | | | | Link went to a broken 404 error page
* | | | Merge pull request #704 from hmhealey/freetypeChristopher Speller2015-09-1775-7/+89256
|\ \ \ \ | | | | | | | | | | Updated godep workspace and freetype library so that godep save and restore work again
| * | | | Updated godep workspace and freetype library so that godep save and restore ↵hmhealey2015-09-1775-7/+89256
| | | | | | | | | | | | | | | | | | | | work again
* | | | | Merge pull request #701 from mattermost/PLT-40Joram Wilander2015-09-17885-2/+42
|\ \ \ \ \ | |_|/ / / |/| | | | PLT-40 adding experimental support for emojis
| * | | | Fixing css=Corey Hulen2015-09-164-9/+7
| | | | |
| * | | | PLT-40 adding experimental support for emojis=Corey Hulen2015-09-16886-2/+44
| | |_|/ | |/| |
* | | | Merge pull request #703 from mattermost/add-gofmtCorey Hulen2015-09-178-11/+29
|\ \ \ \ | |_|/ / |/| | | Adding gofmt to travis build
| * | | Adding gofmt to travis buildChristopher Speller2015-09-178-11/+29
| |/ /
* | | Merge pull request #683 from mattermost/it33-patch-1Harrison Healey2015-09-171-1/+3
|\ \ \ | | | | | | | | Fixed style guide link, added description
| * | | Fixed typoit332015-09-171-1/+1
| | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 22:44:47 +0000