Commit graph

2190 commits

Author SHA1 Message Date
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
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
e01a79aca7 update live tv images 2015-11-20 19:27:34 -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
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
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
1224f21ca1 update web components 2015-11-12 21:50:58 -05:00
Luke
1051745fd1 Merge pull request #1265 from MediaBrowser/master
update use of FileAttributes
2015-11-12 15:54:31 -05:00
Luke Pulverenti
c6ce834216 update use of FileAttributes 2015-11-12 15:51:39 -05:00
Luke
107315f59d Merge pull request #1254 from MediaBrowser/master
merge from master
2015-11-11 21:45:46 -05:00
Luke Pulverenti
040c0ea21a fix schedules direct request dates 2015-11-11 21:25:12 -05:00
Luke Pulverenti
c15afb479b update ffmpeg 2015-11-11 10:46:30 -05:00
Luke Pulverenti
cc19ce0daf added new parent methods 2015-11-11 09:56:31 -05:00
Luke Pulverenti
98020809c8 fix repeated errors when server has only readonly access 2015-11-10 23:11:03 -05:00
Luke Pulverenti
e1ea92890d update ScheduleDirect 2015-11-10 13:58:05 -05:00
Luke Pulverenti
64a683e84d update plugin installs 2015-11-10 08:36:15 -05:00
Luke Pulverenti
81bb469fe1 reduce image processing 2015-11-09 13:18:37 -05:00
Luke Pulverenti
f9e9f5bef6 show more music favorites 2015-11-08 22:41:45 -05:00
Luke Pulverenti
7760f022af fix theme videos 2015-11-08 00:04:38 -05:00
Luke
1b0b7ac6a5 Merge pull request #1252 from MediaBrowser/master
merge from master
2015-11-07 20:23:49 -05:00
Luke Pulverenti
5eb86b686b update notifications 2015-11-07 20:17:32 -05:00
Luke Pulverenti
8f239f0cde update schedules direct timeout 2015-11-07 20:13:46 -05:00
Luke Pulverenti
7e53bc6d00 update web socket notifier 2015-11-07 20:13:38 -05:00
Luke Pulverenti
b6f15b084c update SocketHttpListener 2015-11-06 16:10:30 -05:00
Luke Pulverenti
79f4c3b30d add sync logging 2015-11-06 11:46:51 -05:00
Luke Pulverenti
6f619eff5f update SocketHttpListener 2015-11-06 10:53:23 -05:00