6150 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Luke Pulverenti	12307db4d4	sync version	2015-11-24 01:23:06 -05:00
Luke Pulverenti	35a5ad20bf	update paper drawer panel	2015-11-23 15:09:55 -05:00
Luke Pulverenti	03cf0d6df0	update qsv encoding	2015-11-23 11:12:06 -05:00
Luke Pulverenti	1ee7826be6	restore changes	2015-11-23 11:04:57 -05:00
Luke	4294df7a81	Merge pull request #1281 from MediaBrowser/master ... merge from master	2015-11-23 11:06:17 -05:00
Luke Pulverenti	708c000be5	fix merge conflicts	2015-11-23 11:02:48 -05:00
Luke Pulverenti	155c519080	fix merge conflits	2015-11-23 11:01:42 -05:00
Luke Pulverenti	d6952fe66e	update live tv manager	2015-11-22 18:06:11 -05:00
Luke Pulverenti	aeb4c520be	update qsv encoding	2015-11-22 15:46:02 -05:00
Luke Pulverenti	455d38ceb4	fix project	2015-11-22 13:22:12 -05:00
Luke Pulverenti	9e568bf99a	update dlna profile header checks	2015-11-22 13:18:53 -05:00
Luke Pulverenti	7db806da0a	start replacing jquery ajax with fetch	2015-11-22 13:17:58 -05:00
Luke Pulverenti	6c27159406	update auto-organize	2015-11-22 00:15:00 -05:00
Luke Pulverenti	4a24490752	fix MarkPlayed	2015-11-21 22:49:12 -05:00
Luke Pulverenti	cd1abf72f6	update default images	2015-11-21 22:48:57 -05:00
Luke Pulverenti	cfce61efbc	update translations	2015-11-21 12:05:47 -05:00
Luke	a07202a756	Merge pull request #1280 from MediaBrowser/master ... update ConvertImageToLocal	2015-11-21 12:04:20 -05:00
Luke Pulverenti	3766584e73	update ConvertImageToLocal	2015-11-21 00:51:47 -05:00
Luke Pulverenti	9cdb4ac242	restore changes	2015-11-21 00:01:16 -05:00
Luke	3ebcc9d599	Merge pull request #1279 from MediaBrowser/master ... merge from master	2015-11-21 00:01:37 -05:00
Luke Pulverenti	8fcbb60cf7	fix merge conflict	2015-11-20 23:58:20 -05:00
Luke Pulverenti	45a58de539	fix merge conflict	2015-11-20 23:57:47 -05:00
Luke Pulverenti	02aee9dc90	fix merge conflict	2015-11-20 23:57:11 -05:00
Luke Pulverenti	170f463664	mix merge conflicts	2015-11-20 23:55:26 -05:00
Luke Pulverenti	6de54e5ec7	fix merge conflict	2015-11-20 23:54:41 -05:00
Luke Pulverenti	60cd72b974	update channel item images	2015-11-20 23:53:40 -05:00
Luke Pulverenti	057c4b5494	support image placeholders	2015-11-20 23:44:22 -05:00
Luke Pulverenti	fe5537f779	update EmbyTV	2015-11-20 23:34:55 -05:00
Luke Pulverenti	b9699fde05	update schedules direct	2015-11-20 22:13:43 -05:00
Luke Pulverenti	be1dad4a32	restore changes	2015-11-20 22:13:03 -05:00
Luke	c379ebed06	Merge pull request #1278 from MediaBrowser/master ... merge from master	2015-11-20 22:12:32 -05:00
Luke Pulverenti	845bea9a64	sync with master	2015-11-20 22:07:44 -05:00
Luke Pulverenti	82058128d6	sync with master	2015-11-20 22:06:12 -05:00
Luke Pulverenti	5d5583b025	update sync	2015-11-20 21:04:59 -05:00
Luke Pulverenti	d6418e6e9c	update hls	2015-11-20 21:04:50 -05:00
Luke Pulverenti	e01a79aca7	update live tv images	2015-11-20 19:27:34 -05:00
Luke Pulverenti	c4fa6a28db	update components	2015-11-20 19:12:44 -05:00
Luke Pulverenti	435c1416fc	add hlsjs	2015-11-20 15:46:00 -05:00
Luke Pulverenti	2f525a0c1c	update image provider	2015-11-20 15:39:11 -05:00
Luke Pulverenti	2267a17123	update schedules direct timeouts	2015-11-20 15:38:50 -05:00
Luke Pulverenti	8af05ef4ec	update links	2015-11-20 15:38:27 -05:00
Luke Pulverenti	625a089737	update image provider	2015-11-20 12:55:38 -05:00
Luke Pulverenti	7568970fd6	update translations	2015-11-19 21:54:33 -05:00
Luke Pulverenti	95532c4e1e	update cinema mode text	2015-11-19 00:22:57 -05:00
Luke Pulverenti	b28be7e986	update cinema mode on/off setting	2015-11-19 00:19:54 -05:00
Luke Pulverenti	252dde1722	update components	2015-11-18 21:35:08 -05:00
Luke Pulverenti	904175ce26	update views	2015-11-18 00:49:20 -05:00
Luke Pulverenti	736d87fd7e	switch recording provider to AddOrUpdate	2015-11-17 23:18:51 -05:00
Luke Pulverenti	2ee91249e5	revert channel manager changes	2015-11-17 13:24:40 -05:00
Luke Pulverenti	5013fddc2d	update channel manager	2015-11-17 13:23:18 -05:00