Commit Graph

6089 Commits

Author SHA1 Message Date
Luke Pulverenti
da1595f9b0 update version 2015-11-16 16:44:03 -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
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
Luke Pulverenti
73c772637e restore changes 2015-11-13 15:56:26 -05:00
Luke Pulverenti
0c0c017b2f Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-11-13 15:54:53 -05:00
Luke
47a862b0e8 Merge pull request #1269 from MediaBrowser/master
merge from master
2015-11-13 15:55:23 -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
9c6cb3f8f6 update i/o methods 2015-11-13 15:49:21 -05:00
Luke Pulverenti
62960ea869 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-11-13 15:48:30 -05:00
Luke Pulverenti
578fc7be14 use DateTime.TryParse 2015-11-13 15:48:21 -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
c7af567e5c remove duplicate call 2015-11-13 15:42:39 -05:00
Luke Pulverenti
7291b8d3e4 use DateTime.TryParse 2015-11-13 15:34:34 -05:00
Luke
116a409f8e Merge pull request #1267 from MediaBrowser/master
update README.md
2015-11-13 00:22:49 -05:00
Luke Pulverenti
a5162df829 update README.md 2015-11-13 00:19:46 -05:00
Luke Pulverenti
1224f21ca1 update web components 2015-11-12 21:50:58 -05:00
Luke Pulverenti
f0b072331f update h264/qsv params 2015-11-12 21:50:24 -05:00
Luke Pulverenti
de807fa9de add attribute 2015-11-12 21:50:02 -05:00
Luke Pulverenti
d7998d85be add attribute 2015-11-12 21:49:47 -05:00
Luke Pulverenti
e760f4e124 add logging 2015-11-12 21:49:32 -05:00
Luke
708a810b76 Merge pull request #1266 from MediaBrowser/master
update image sizes
2015-11-12 21:47:44 -05:00
Luke Pulverenti
cf68f08b9f update image sizes 2015-11-12 21:44:50 -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
bccd268081 Merge pull request #1264 from MediaBrowser/master
update metadata config page
2015-11-12 15:15:06 -05:00
Luke
0f9580d339 Merge pull request #1263 from MediaBrowser/master
update image sizing
2015-11-12 14:54:15 -05:00
Luke Pulverenti
8a82d324dd fix merge conflicts 2015-11-12 14:51:34 -05:00
Luke Pulverenti
bbd672bf95 update image sizing 2015-11-12 14:49:19 -05:00
Luke Pulverenti
0d5903f215 update image magick encoder 2015-11-12 14:31:25 -05:00