298 Commits

Author	SHA1	Message	Date
JoramWilander	84763e9bde	Added welcome email back in.	2015-09-25 08:19:05 -04:00
=Corey Hulen	00112cae51	Assiging first user system_admin role	2015-09-23 15:52:59 -07:00
=Corey Hulen	985aebf861	Fixing state setting	2015-09-23 15:16:48 -07:00
=Corey Hulen	7f3bfdbe0c	Fixing merge	2015-09-23 14:38:34 -07:00
=Corey Hulen	ccf2e6e4e7	Changing image settings to file settings	2015-09-23 13:47:10 -07:00
=Corey Hulen	2b5b8f95ed	Merge branch 'master' into PLT-11-email	2015-09-23 12:55:58 -07:00
=Corey Hulen	1626a6de6f	PLT-349 adding team mgt to admin console	2015-09-23 12:49:28 -07:00
Harrison Healey	15f15de8ca	Merge pull request #759 from mattermost/plt-242-3 ... PLT-242 Implement custom UI theme colors.	2015-09-23 15:04:22 -04:00
Chengwei Yang	f7a32fa38a	PLT-126: Change 'Private Messages' to 'Direct Messages' ... Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>	2015-09-23 22:43:14 +08:00
JoramWilander	e4a15076f4	Implement UI theme colors.	2015-09-23 10:12:40 -04:00
=Corey Hulen	6e60768abe	Fixing merge conflict	2015-09-22 13:18:42 -07:00
Joram Wilander	ac7918c554	Merge pull request #715 from mattermost/plt-27 ... PLT-27 Implement incoming webhooks.	2015-09-22 15:47:57 -04:00
=Corey Hulen	fc71869a96	Merge branch 'master' into PLT-11-email	2015-09-22 12:24:39 -07:00
=Corey Hulen	88e5a71e8c	Adding service settings to admin console	2015-09-22 12:12:50 -07:00
Jack	602bed85f2	fix conflict	2015-09-22 08:16:51 -07:00
=Corey Hulen	08a3acbb44	Adding team settings to admin console	2015-09-22 01:15:41 -07:00
=Corey Hulen	afcff9b301	Fixing unit tests	2015-09-21 20:38:31 -07:00
=Corey Hulen	e78c79b832	Adding rate limiter settings to the admin console	2015-09-21 19:01:52 -07:00
=Corey Hulen	0529a494ae	Adding image properties	2015-09-21 17:34:13 -07:00
=Corey Hulen	ed9a2da83b	Adding email to admin console	2015-09-21 15:11:56 -07:00
JoramWilander	98186e5018	Implement incoming webhooks.	2015-09-21 14:22:23 -04:00
Christopher Speller	8b5cfa4594	Merge pull request #708 from hmhealey/plt173 ... PLT-173 Rotate images with a non-standard orientation before generating a thumbnail and preview	2015-09-21 10:47:09 -04:00
hmhealey	4b177a6ed5	Added constants for EXIF orientations	2015-09-21 09:17:23 -04:00
it33	4a13d37367	Renaming "Handle" to "Channel URL" or "URL"	2015-09-20 21:17:20 -07:00
Harrison Healey	679e20aa4b	Merge pull request #709 from mattermost/PLT-11 ... PLT-11 adding config for logs to UI	2015-09-18 18:11:01 -04:00
Corey Hulen	0ddabaf8de	Merge pull request #717 from mattermost/fix-loadtest ... Fix authentication for server load tests.	2015-09-18 09:49:49 -07:00
=Corey Hulen	cdf813f07b	merging	2015-09-18 09:25:47 -07:00
JoramWilander	c42a547b4f	Fix authentication for loadtests.	2015-09-18 12:16:53 -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
Jack	a31868336f	go fmt	2015-09-17 23:21:45 -07:00
Jack	e0a91c0d66	content type for getFile	2015-09-17 23:11:03 -07:00
=Corey Hulen	44714dfcb1	PLT-11 Adding ability to save config file	2015-09-17 21:00:59 -07:00
=Corey Hulen	af4deb2369	Making changes to versioning	2015-09-17 13:01:40 -07: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
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
=Corey Hulen	1d37723307	Fixes GIT-698 allow ability to disable team creation for SSO	2015-09-16 21:31:45 -07:00
=Corey Hulen	cef7a1aae4	PLT-92 Adding server side versioning to the binary	2015-09-16 17:37:11 -07: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
JoramWilander	47e6a33a45	Implement OAuth2 service provider functionality.	2015-09-16 15:49:12 -04: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	4e3896d7b1	Adding config file timestamp to X-Version header	2015-09-16 09:37:20 -07:00
=Corey Hulen	5e2f701e6c	Removing old config stuff	2015-09-15 19:09:50 -07:00