2379 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Corey Hulen	d0f97b7a5f	Merge pull request #714 from mattermost/test-matrix ... Adding go 1.5.1 and postgress to travis build	2015-09-18 09:21:05 -07:00
=Corey Hulen	1aa4913c44	fixing merge	2015-09-18 09:19:53 -07:00
JoramWilander	c42a547b4f	Fix authentication for loadtests.	2015-09-18 12:16:53 -04:00
hmhealey	bc8e69d99f	Fixed incorrect check if a url starts with an explicit protocol	2015-09-18 11:56:23 -04:00
Christopher Speller	6eb32591d9	Merge pull request #713 from mattermost/it33-patch-3 ... Adding template for contributor list request	2015-09-18 09:47:12 -04:00
hmhealey	48110020af	PLT-173 Changed thumbnails and previews to generate correctly for images with a non-standard orientation	2015-09-18 09:38:01 -04:00
Christopher Speller	ab771c8f75	Adding go 1.5.1 and postgress to travis build	2015-09-18 09:31:16 -04:00
Christopher Speller	151849d536	Merge pull request #712 from mattermost/postgres-oauth-fix ... With Postgres return false when checking if column exists, if the table does not exist.	2015-09-18 09:30:25 -04:00
it33	5583907b5b	Adding template for contributor list request	2015-09-18 05:55:02 -07:00
JoramWilander	432753bb4d	Return false when checking if column exists, if the table does not exist with postgres.	2015-09-18 08:07:31 -04:00
Christopher Speller	c717fcb325	Merge pull request #665 from chengweiv5/fix-coding-style ... Fix coding style: replace tab with whitespace in mattermost config	2015-09-18 07:48:25 -04:00
=Corey Hulen	60af1fad1f	Moving logout item	2015-09-17 22:25:37 -07:00
=Corey Hulen	804b696bdc	PLT-11 adding config for logs to UI	2015-09-17 22:00:33 -07:00
=Corey Hulen	44714dfcb1	PLT-11 Adding ability to save config file	2015-09-17 21:00:59 -07:00
hmhealey	d83be6df2d	PLT-173 Added graphics-go and goexif libraries for image manipulation	2015-09-17 19:13:42 -04:00
Corey Hulen	82127341ca	Merge pull request #705 from esethna/patch-1 ... Grammar change to New Channel ui text	2015-09-17 13:25:21 -07:00
=Corey Hulen	c63da24964	moving to security tab	2015-09-17 13:24:55 -07:00
=Corey Hulen	522e4934c9	fixing versioning	2015-09-17 13:06:25 -07:00
=Corey Hulen	af4deb2369	Making changes to versioning	2015-09-17 13:01:40 -07:00
Joram Wilander	a4aad2b69b	Merge pull request #706 from lindy65/patch-2 ... Fixing URL for "Developer Machine Setup"	2015-09-17 15:48:50 -04:00
lindy65	7994e7ddb9	Fixing URL for "Developer Machine Setup" ... Link went to a broken 404 error page	2015-09-17 21:24:14 +02:00
=Corey Hulen	9b5198c69c	Merge branch 'master' into PLT-92	2015-09-17 09:21:56 -07:00
Christopher Speller	3edd8dbdf6	Merge pull request #704 from hmhealey/freetype ... Updated godep workspace and freetype library so that godep save and restore work again	2015-09-17 12:17:27 -04:00
Joram Wilander	7901126b63	Merge pull request #701 from mattermost/PLT-40 ... PLT-40 adding experimental support for emojis	2015-09-17 11:56:59 -04:00
esethna	aa79a12a31	Grammar change to New Channel ui text	2015-09-17 09:56:42 -06:00
Corey Hulen	de64bd19d5	Merge pull request #703 from mattermost/add-gofmt ... Adding gofmt to travis build	2015-09-17 08:44:50 -07:00
hmhealey	4005d8bfd0	Updated godep workspace and freetype library so that godep save and restore work again	2015-09-17 11:10:06 -04:00
Christopher Speller	eb4b80a484	Adding gofmt to travis build	2015-09-17 09:07:37 -04:00
Harrison Healey	047fec54cc	Merge pull request #683 from mattermost/it33-patch-1 ... Fixed style guide link, added description	2015-09-17 08:34:00 -04:00
it33	ed976112ad	Fixed typo	2015-09-17 05:10:12 -07:00
Christopher Speller	1bb2e5a217	Merge pull request #700 from mattermost/GIT-698 ... Fixes GIT-698 allow ability to disable team creation for SSO	2015-09-17 07:54:30 -04:00
Joram Wilander	fd3a7afb3e	Merge pull request #702 from mattermost/oauth-switch-fix ... Properly check if OAuth providing is enabled on the client.	2015-09-17 07:53:02 -04:00
Joram Wilander	936f032ec4	Merge pull request #680 from hmhealey/plt159 ... PLT-159 Properly hide unread indicators when there are no unread channels	2015-09-17 07:49:29 -04:00
JoramWilander	ce19b3c211	Properly check if OAuth providing is enabled on the client.	2015-09-17 07:46:38 -04:00
=Corey Hulen	99d0db136c	Fixing css	2015-09-16 23:27:25 -07:00
=Corey Hulen	8e848f38d5	PLT-40 adding experimental support for emojis	2015-09-16 23:22:15 -07:00
=Corey Hulen	1d37723307	Fixes GIT-698 allow ability to disable team creation for SSO	2015-09-16 21:31:45 -07:00
=Corey Hulen	51c3445e69	Fixing postgres issue and bumping version number	2015-09-16 21:16:07 -07:00
=Corey Hulen	4352118700	Adding version to UI	2015-09-16 20:16:42 -07:00
=Corey Hulen	abda39b652	Adding database schema version	2015-09-16 19:59:57 -07:00
=Corey Hulen	1e7f7852ad	Outputing version to logs on server start	2015-09-16 17:49:48 -07:00
=Corey Hulen	e3bf54f161	fixing build	2015-09-16 17:45:00 -07:00
=Corey Hulen	cef7a1aae4	PLT-92 Adding server side versioning to the binary	2015-09-16 17:37:11 -07:00
Christopher Speller	acf2fb64b4	Cleaned up logic for the unread indicators	2015-09-16 17:08:05 -04:00
hmhealey	7e66a3d5be	Moved unread channel indicators into their own React component and file	2015-09-16 16:51:16 -04:00
hmhealey	8d0c69aec6	Properly hide unread channel indicators when there are no unread channels	2015-09-16 16:51:16 -04:00
Christopher Speller	e644b53b72	Merge pull request #697 from mattermost/PLT-93 ... PLT-93 Fixing broken email templates	2015-09-16 16:32:27 -04:00
Christopher Speller	720f1082d3	Merge pull request #696 from mattermost/PLT-23 ... PLT-23 error.html pulls files from static	2015-09-16 16:31:26 -04:00
Christopher Speller	dc74d57611	Merge pull request #694 from mattermost/GIT-669 ... Fixing 669 removing -a flag from go cmds	2015-09-16 16:30:05 -04:00
Christopher Speller	b1f26540ce	Merge pull request #693 from mattermost/mm-1419 ... Implement OAuth2 service provider functionality.	2015-09-16 16:26:56 -04:00