2306 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
=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
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
JoramWilander	47e6a33a45	Implement OAuth2 service provider functionality.	2015-09-16 15:49:12 -04:00
=Corey Hulen	c60e687c6b	Fixing broken email templates	2015-09-16 12:38:51 -07:00
=Corey Hulen	609e5c6652	Fixing broken email templates	2015-09-16 12:38:09 -07:00
=Corey Hulen	c7bb4ab7f8	Fixing broken email templates	2015-09-16 12:37:54 -07:00
=Corey Hulen	ac38aadc12	Fixing broken email templates	2015-09-16 12:36:35 -07:00
=Corey Hulen	c2829b24e4	PLT-23 error.html pulls files from static	2015-09-16 12:08:26 -07:00
=Corey Hulen	986aeae7ce	PLT-23 error.html pulls files from static	2015-09-16 12:06:49 -07:00
Corey Hulen	4e11fa23d7	Merge pull request #695 from hmhealey/startswith ... Replaced instances of startsWith with lastIndexOf in TextFormatting	2015-09-16 11:17:25 -07:00
hmhealey	60d2cff723	Replaced instances of startsWith with lastIndexOf in TextFormatting	2015-09-16 14:08:10 -04:00
Christopher Speller	7e418714bc	Merge pull request #687 from mattermost/PLT-93 ... PLT-93 Cleaning up client side configs	2015-09-16 12:52:50 -04:00
=Corey Hulen	f16e0a47ce	Fixing 669 removing -a flag from go cmds	2015-09-16 09:50:20 -07:00
Corey Hulen	9828d84f01	Merge pull request #691 from asaadmahmoodspin/ui-changes ... UI Updates for multiple tickets	2015-09-16 09:44:52 -07:00
Corey Hulen	1220a09858	Merge pull request #692 from hmhealey/plt149 ... PLT-149 Removed the file list from (message deleted) placeholder posts	2015-09-16 09:44:26 -07:00
=Corey Hulen	4e3896d7b1	Adding config file timestamp to X-Version header	2015-09-16 09:37:20 -07:00
=Corey Hulen	84c0b96e0b	Merge branch 'master' into PLT-93	2015-09-16 09:29:50 -07:00
hmhealey	5567651119	PLT-149 Removed the file list from (message deleted) placeholder posts	2015-09-16 12:02:29 -04:00
Asaad Mahmood	28b61e6437	UI Updates for multiple tickets	2015-09-16 20:32:10 +05:00
Harrison Healey	d4887cef03	Merge pull request #690 from mattermost/fix-safari ... Fixing issues on safari	2015-09-16 10:40:52 -04:00
Christopher Speller	395e5cd854	Removing js map from react bootstrap to make safari happy. ... Adding babel runtime to build process because Safari hasen't gotten with the program yet.	2015-09-16 10:20:17 -04:00
Joram Wilander	9f2cd77dc8	Merge pull request #686 from hmhealey/plt172 ... PLT-172 Fixes TypeErrors and random jumping that occurs when clicking the scroll bar in the sidebar	2015-09-16 07:44:45 -04:00
Joram Wilander	40f4aadbf7	Merge pull request #688 from mattermost/fixing-typo ... Fixing typo	2015-09-16 07:43:47 -04:00
=Corey Hulen	24a8c6c24c	Fixing typo	2015-09-15 19:56:21 -07:00