Commit Graph

7729 Commits

Author SHA1 Message Date
Luke Pulverenti
8b163221f7 fix merge conflict 2016-04-17 16:59:20 -04:00
Luke
6bbf0e8248 Merge pull request #1658 from MediaBrowser/beta
Beta
2016-04-16 15:50:53 -04:00
Luke
7395cc9b93 Merge pull request #1657 from MediaBrowser/dev
update people validator
2016-04-16 15:50:43 -04:00
Luke Pulverenti
0688be857e update people validator 2016-04-16 15:49:26 -04:00
Luke
2500cdc52d Merge pull request #1656 from MediaBrowser/beta
Beta
2016-04-16 15:47:39 -04:00
Luke
805956642b Merge pull request #1655 from MediaBrowser/dev
update sidebar
2016-04-16 15:47:24 -04:00
Luke Pulverenti
f3f3da0d8b Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-04-16 15:28:00 -04:00
Luke Pulverenti
b0839ffd2c restore version 2016-04-16 15:27:50 -04:00
Luke
a519f1a2fb Merge pull request #1654 from MediaBrowser/master
merge from master
2016-04-16 15:27:26 -04:00
Luke
18dbdb194b Merge pull request #1653 from MediaBrowser/beta
Beta
2016-04-16 15:26:00 -04:00
Luke Pulverenti
007f4e193a fix merge conflict 2016-04-16 15:25:16 -04:00
Luke
ed6d8ae87f Merge pull request #1652 from MediaBrowser/dev
update quality pickers
2016-04-16 15:22:40 -04:00
Luke Pulverenti
2ec76f8a16 3.0.5938 2016-04-16 15:07:40 -04:00
Luke
a1611b943c Merge pull request #1651 from MediaBrowser/dev
Dev
2016-04-16 15:07:29 -04:00
Luke Pulverenti
b63dd2e9ae update upcoming 2016-04-16 15:03:19 -04:00
Luke Pulverenti
4c64c42876 update translations 2016-04-16 13:24:00 -04:00
Luke Pulverenti
cf4a14357e restore hdhr direct play for now 2016-04-16 13:19:20 -04:00
Luke Pulverenti
da0f4017ac 3.0.5937 2016-04-16 01:13:00 -04:00
Luke
8d6fc3a4a2 Merge pull request #1650 from MediaBrowser/dev
Dev
2016-04-16 01:11:14 -04:00
Luke Pulverenti
d1b3342e75 update inherited tags 2016-04-16 01:09:58 -04:00
Luke Pulverenti
cff3df38ee fixes #1581 - Metadata Manager: Disable display of "MissingTrailer" icon 2016-04-16 01:08:14 -04:00
Luke Pulverenti
bfc8facc60 fixes #1261 - Sync quality cannot be changed 2016-04-16 01:05:34 -04:00
Luke Pulverenti
81d9ea05f6 fix image refresh 2016-04-15 22:18:40 -04:00
Luke Pulverenti
5de094674b 3.0.5936 2016-04-14 22:43:46 -04:00
Luke
fd72bdab5c Merge pull request #1649 from MediaBrowser/dev
Dev
2016-04-14 22:42:29 -04:00
Luke Pulverenti
7f2b2e1b9a fix block by inherited tags 2016-04-14 22:39:39 -04:00
Luke Pulverenti
57e3bb72f9 update stream selection 2016-04-14 15:12:00 -04:00
Luke
e34dc6701b Merge pull request #1645 from vicpa/dev
qsv encode liveTV
2016-04-14 12:41:59 -04:00
Luke Pulverenti
a47271321f 3.0.5935 2016-04-13 17:20:02 -04:00
Luke
d63e68d356 Merge pull request #1647 from MediaBrowser/dev
fix tabs
2016-04-13 16:57:00 -04:00
Luke Pulverenti
b0379ec7f8 improve embedded image extraction 2016-04-13 16:49:16 -04:00
Luke Pulverenti
41ee4600fd fix tabs 2016-04-13 12:17:52 -04:00
Luke Pulverenti
c72561176b 3.0.5934 2016-04-13 02:05:30 -04:00
Luke
4415b997f3 Merge pull request #1646 from MediaBrowser/dev
Dev
2016-04-13 02:04:57 -04:00
vicpa
67fbaa2433 qsv endcode 2016-04-12 16:09:05 -04:00
Luke Pulverenti
6fdce00ea0 3.0.5933 2016-04-12 14:15:55 -04:00
Luke
6ebe07a103 Merge pull request #1644 from MediaBrowser/dev
Dev
2016-04-12 14:16:45 -04:00
Luke Pulverenti
6f82815a5d target .net framework 4.6 2016-04-12 14:14:59 -04:00
Luke Pulverenti
8c4468a330 update logging 2016-04-12 14:01:23 -04:00
Luke
ad3a6465eb Merge pull request #1643 from MediaBrowser/dev
Dev
2016-04-12 13:43:09 -04:00
Luke Pulverenti
5bddb226f6 update hdhr stream 2016-04-12 13:37:58 -04:00
Luke Pulverenti
3966eadfad update packages 2016-04-12 00:03:07 -04:00
Luke Pulverenti
5c8bd5559d trim search requests 2016-04-11 10:26:54 -04:00
Luke Pulverenti
b8217b6e50 3.0.5932 2016-04-11 10:16:17 -04:00
Luke
aa65c1d06e Merge pull request #1642 from MediaBrowser/dev
Dev
2016-04-11 10:13:50 -04:00
Luke Pulverenti
baca0d6244 update scroll styles 2016-04-11 00:24:16 -04:00
Luke Pulverenti
3d1c950de8 improve connect error messages 2016-04-10 17:11:06 -04:00
Luke Pulverenti
4f8764ee5a fix collection grouping for plain folders 2016-04-10 16:09:55 -04:00
Luke Pulverenti
670a388f61 3.0.5913 2016-04-09 22:35:44 -04:00
Luke Pulverenti
412c35efef Merge branch 'master' into beta 2016-04-09 22:32:53 -04:00