Commit Graph

2209 Commits

Author SHA1 Message Date
Luke Pulverenti
35a5ad20bf update paper drawer panel 2015-11-23 15:09:55 -05:00
Luke Pulverenti
1ee7826be6 restore changes 2015-11-23 11:04:57 -05:00
Luke Pulverenti
708c000be5 fix merge conflicts 2015-11-23 11:02:48 -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 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 Pulverenti
845bea9a64 sync with master 2015-11-20 22:07:44 -05:00
Luke Pulverenti
5d5583b025 update sync 2015-11-20 21:04:59 -05:00
Luke Pulverenti
e01a79aca7 update live tv images 2015-11-20 19:27:34 -05:00
Luke Pulverenti
2267a17123 update schedules direct timeouts 2015-11-20 15:38:50 -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
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
Luke Pulverenti
9a3bc0a2e7 update view generation 2015-11-17 13:17:52 -05:00
Luke Pulverenti
2c52712c4e update intro provider 2015-11-17 12:46:15 -05:00
Luke Pulverenti
6186d2809f update cinema mode config 2015-11-17 12:41:58 -05:00
Luke Pulverenti
664bcadbad update cinema mode config page 2015-11-17 11:37:16 -05:00
Luke Pulverenti
51d00cf3fd update queries 2015-11-16 17:03:11 -05:00
Luke Pulverenti
28ad359814 update SocketHttpListener 2015-11-16 13:44:15 -05:00
Luke Pulverenti
004960476f update querying 2015-11-16 12:35:23 -05:00
Luke Pulverenti
d9f062f5aa update queries 2015-11-16 11:38:12 -05:00
Luke Pulverenti
72a0c2afeb update playlist query 2015-11-15 17:30:47 -05:00
Luke Pulverenti
a86d0a3585 update subtitles 2015-11-14 14:56:56 -05:00
Luke Pulverenti
ab6fefbbbd fixes #1248 - Browsing to /web/ causes error 2015-11-14 14:09:49 -05:00
Luke Pulverenti
f6e73a428e update querying 2015-11-14 13:57:26 -05:00
Luke Pulverenti
743102b88f update views 2015-11-14 12:05:08 -05:00
Luke Pulverenti
e32dcb38e4 update timeline view 2015-11-14 11:58:01 -05:00
Luke Pulverenti
d94507a441 added query types 2015-11-14 01:58:22 -05:00
Luke Pulverenti
b992659f24 fix recording icons 2015-11-13 23:19:05 -05:00
Luke Pulverenti
73c772637e restore changes 2015-11-13 15:56:26 -05:00
Luke Pulverenti
4c5ea9070f add master changes 2015-11-13 15:54:04 -05:00
Luke Pulverenti
32cec257ba restore changes 2015-11-13 15:53:29 -05:00
Luke Pulverenti
e73b353b20 fix merge conflict 2015-11-13 15:52:32 -05:00
Luke Pulverenti
7378664174 fix merge conflict 2015-11-13 15:51:03 -05:00
Luke Pulverenti
3e5bb74fcc update i/o methods 2015-11-13 15:45:19 -05:00
Luke Pulverenti
ba3f23bad4 update logging 2015-11-13 15:45:10 -05:00
Luke Pulverenti
1224f21ca1 update web components 2015-11-12 21:50:58 -05:00