Commit Graph

9368 Commits

Author SHA1 Message Date
Luke Pulverenti
fd3ff632d4 Merge branch 'master' into dev 2016-06-16 14:11:10 -04:00
Luke Pulverenti
4f791d6ee1 Merge branch 'dev' 2016-06-16 14:10:58 -04:00
Luke Pulverenti
d9406d48ca 3.0.5973 2016-06-16 13:24:59 -04:00
Luke Pulverenti
a2056a9307 update urls 2016-06-16 13:24:22 -04:00
Luke
bcb814aa31 Merge pull request #1853 from MediaBrowser/dev
update urls
2016-06-16 13:23:34 -04:00
Luke Pulverenti
7498b7b5b7 update urls 2016-06-16 13:23:06 -04:00
Luke Pulverenti
c807bb4d0e 3.1.25 2016-06-16 09:27:37 -04:00
Luke
6a47d51fad Merge pull request #1852 from MediaBrowser/dev
Dev
2016-06-16 09:24:57 -04:00
Luke Pulverenti
626a2ed2a9 update child count creation 2016-06-16 09:24:12 -04:00
Luke Pulverenti
ed6a0b5296 update favorites 2016-06-16 09:18:52 -04:00
Luke Pulverenti
f06390ce86 update music brainz 2016-06-16 02:20:32 -04:00
Luke
74b57185f6 Merge pull request #1850 from MediaBrowser/dev
Dev
2016-06-15 22:47:20 -04:00
Luke Pulverenti
37d7db4bc4 support xmltv gzip 2016-06-15 22:37:06 -04:00
Luke Pulverenti
825f0f3507 update music brainz album responses 2016-06-15 16:14:04 -04:00
Luke Pulverenti
cc2ac9e387 update music brainz album responses 2016-06-15 15:52:38 -04:00
Luke Pulverenti
bd5697625d 3.1.24 2016-06-15 14:59:47 -04:00
Luke
b98d820bd1 Merge pull request #1848 from MediaBrowser/dev
update recording format
2016-06-15 14:59:27 -04:00
Luke Pulverenti
023b12a798 update recording format 2016-06-15 14:56:37 -04:00
Luke Pulverenti
4beb41fea8 3.1.23 2016-06-15 12:49:47 -04:00
Luke
f18ea222f2 Merge pull request #1847 from MediaBrowser/dev
Dev
2016-06-15 12:46:35 -04:00
Luke Pulverenti
6118e5f966 update xmltv downloading 2016-06-15 12:45:45 -04:00
Luke
c20674a299 Merge pull request #1846 from ChubbyArse/dev
IsSeries driven by Episode data
2016-06-15 11:55:46 -04:00
Alex Stevens
1ce4787a35 IsSeries driven by Episode data 2016-06-15 11:30:02 +01:00
Luke Pulverenti
c8b4e580bb fix windows network browser 2016-06-14 23:36:40 -04:00
Luke Pulverenti
48bf454f09 3.1.22 2016-06-14 23:15:45 -04:00
Luke
c91b608005 Merge pull request #1845 from MediaBrowser/dev
Dev
2016-06-14 23:13:13 -04:00
Luke Pulverenti
80863e1326 fix button alignments 2016-06-14 23:12:32 -04:00
Luke Pulverenti
7dd2b1592c add index number filter 2016-06-14 22:18:19 -04:00
Luke Pulverenti
2f39ad1673 encapsulate order by 2016-06-14 22:15:51 -04:00
Luke Pulverenti
50b6d8b8ba continue jquery removal 2016-06-14 16:59:30 -04:00
Luke Pulverenti
51de0d3868 3.1.21 2016-06-14 15:24:13 -04:00
Luke
2b49a0ee0f Merge pull request #1844 from MediaBrowser/dev
Dev
2016-06-14 15:23:39 -04:00
Luke Pulverenti
66c86ccc58 update pooling 2016-06-14 15:21:26 -04:00
Luke
437033111c Merge pull request #1843 from NorthernLights/patch-1
Disable FIPS Validation Check in App.config
2016-06-14 13:48:08 -04:00
Avalon Thorne
318534d476 Disable FIPS Validation Check in App.config
Disables the FIPS Validation Check to allow the MediaBrowser Server Application to run on a Trusted Platform enabled computer running Windows 10. Important information regarding the addition can be found on MSDN: https://msdn.microsoft.com/en-us/library/hh202806(v=vs.110).aspx

While in our discussions with Microsoft Government and Enterprise Support it has been indicated that it's best practice to move to a FIPS validated encryption method (please see MSDN: https://msdn.microsoft.com/en-us/library/0ss79b2x(v=vs.110).aspx to determine an appropriate algorithm), this patch will at minimum allow the application to run by specifying whether to enforce a computer configuration requirement that cryptographic algorithms must comply with the Federal Information Processing Standards or "FIPS."

Please see http://emby.media/community/index.php?/topic/35875-fips-validated-cryptography-fix/ for discussion on the proposed fix.
2016-06-14 05:13:38 -04:00
Luke Pulverenti
48a66372a5 3.1.20 2016-06-14 02:41:57 -04:00
Luke
9644064f12 Merge pull request #1842 from MediaBrowser/dev
Dev
2016-06-14 02:41:27 -04:00
Luke Pulverenti
01c7dba742 don't auto-restart during recordings 2016-06-14 02:40:21 -04:00
Luke Pulverenti
5f1bf17030 update forms 2016-06-14 00:15:13 -04:00
Luke Pulverenti
41eb4a8d59 update forms 2016-06-14 00:06:57 -04:00
Luke Pulverenti
ffeee2255f 3.1.19 2016-06-13 15:06:35 -04:00
Luke
daae42fc35 Merge pull request #1841 from MediaBrowser/dev
Dev
2016-06-13 15:06:32 -04:00
Luke Pulverenti
7c15dc96cb Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-06-13 15:03:00 -04:00
Luke Pulverenti
ad663f8fa8 update sliders 2016-06-13 15:02:48 -04:00
Luke
ff7a3de69d Merge pull request #1839 from ChubbyArse/dev
Added code to GetChannels and fixed IsPremiere to use the new XmlTvPremiere object
2016-06-13 12:01:55 -04:00
Luke Pulverenti
7177c6e247 3.1.18 2016-06-12 19:36:41 -04:00
Luke
f838ae0a46 Merge pull request #1838 from MediaBrowser/dev
Dev
2016-06-12 19:35:22 -04:00
Luke Pulverenti
383110f9af switch recordings to ts when preserving original audio 2016-06-12 19:33:11 -04:00
Luke Pulverenti
f378a2c789 update item queries 2016-06-12 01:03:52 -04:00
Luke Pulverenti
d7edd499d2 update organizer db 2016-06-11 21:25:20 -04:00