Commit graph

6319 commits

Author SHA1 Message Date
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
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 e70782a478 update user view builder 2015-11-17 12:38:31 -05:00
Luke Pulverenti 35449735be add back CollectionType 2015-11-17 12:35:43 -05:00
Luke Pulverenti 664bcadbad update cinema mode config page 2015-11-17 11:37:16 -05:00
Luke Pulverenti a67c8df252 update ffmpeg 2015-11-16 18:32:32 -05:00
Luke Pulverenti 51d00cf3fd update queries 2015-11-16 17:03:11 -05:00
Luke 79b2415fdf Merge pull request #1275 from MediaBrowser/master
merge from master
2015-11-16 16:47:19 -05:00
Luke Pulverenti da1595f9b0 update version 2015-11-16 16:44:03 -05:00
Luke Pulverenti c7af7f6d58 fix ImageByNameService 2015-11-16 15:26: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 90b915256d 3.0.5781.2 2015-11-16 11:56:42 -05:00
Luke Pulverenti d9f062f5aa update queries 2015-11-16 11:38:12 -05:00
Luke Pulverenti 728a1ba610 added music folders view 2015-11-15 21:33:32 -05:00
Luke Pulverenti 72a0c2afeb update playlist query 2015-11-15 17:30:47 -05:00
Luke a45831cdcf Merge pull request #1273 from MediaBrowser/master
fix yellow bars in chrome forms
2015-11-14 23:38:57 -05:00
Luke Pulverenti a86d0a3585 update subtitles 2015-11-14 14:56:56 -05:00
Luke Pulverenti 3eda14eff0 fixes #1218 - Dlna server doesn't work after resuming to sleep 2015-11-14 14:41:49 -05:00
Luke Pulverenti 02b828a0e2 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-11-14 14:31:12 -05:00
Luke 5ab1511db5 Merge pull request #1272 from MediaBrowser/master
fixes #1110 - Webplayer: Mouseover should move subtitles
2015-11-14 14:33:29 -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 c97a88377f Merge pull request #1271 from MediaBrowser/master
added query types
2015-11-14 02:01:19 -05:00
Luke Pulverenti d94507a441 added query types 2015-11-14 01:58:22 -05:00
Luke 95998693f1 Merge pull request #1270 from MediaBrowser/master
adjust default user config
2015-11-13 23:28:28 -05:00
Luke Pulverenti 6e17c04c42 adjust default user config 2015-11-13 23:25:24 -05:00
Luke Pulverenti b992659f24 fix recording icons 2015-11-13 23:19:05 -05:00