Commit Graph

9508 Commits

Author SHA1 Message Date
Luke
379b5f402d Merge pull request #2154 from MediaBrowser/dev
Dev
2016-09-09 16:21:13 -04:00
Luke
5192e8a6d2 update mac project 2016-09-09 16:18:22 -04:00
Luke
8d9fb0c265 update mac project 2016-09-09 16:15:39 -04:00
Luke
3363c2f221 Merge pull request #2153 from MediaBrowser/beta
Beta
2016-09-09 16:07:08 -04:00
Luke
94ff39d137 Merge pull request #2152 from MediaBrowser/dev
Dev
2016-09-09 16:06:53 -04:00
Luke Pulverenti
e821c38cd4 restore version 2016-09-09 15:44:40 -04:00
Luke
080a6511dc Merge pull request #2151 from MediaBrowser/beta
Beta
2016-09-09 15:42:40 -04:00
Luke Pulverenti
51051c27cd Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-09-09 15:42:10 -04:00
Luke Pulverenti
ecc1ac78bb fix merge conflict 2016-09-09 15:41:49 -04:00
Luke
5ad606a223 Merge pull request #2150 from MediaBrowser/dev
update theme song settings
2016-09-09 15:03:29 -04:00
Luke Pulverenti
aa6722558f 3.1.143" 2016-09-09 14:29:37 -04:00
Luke
dd463ab06c Merge pull request #2149 from MediaBrowser/dev
Dev
2016-09-09 14:27:09 -04:00
Luke Pulverenti
064ea27994 update default image extraction timeouts 2016-09-09 14:26:05 -04:00
Luke Pulverenti
e4357a17f7 update dialogs 2016-09-09 12:58:08 -04:00
Luke Pulverenti
8f604c657c 3.1.142 2016-09-09 03:04:18 -04:00
Luke
1629f89ed9 Merge pull request #2148 from MediaBrowser/dev
fix dupe titles
2016-09-09 03:03:12 -04:00
Luke
11f5b9db96 Merge pull request #2147 from MediaBrowser/dev
Dev
2016-09-09 03:00:03 -04:00
Luke Pulverenti
906546ca5e update dialogs 2016-09-09 02:59:23 -04:00
Luke Pulverenti
0d87833ae2 3.1.141 2016-09-08 17:31:53 -04:00
Luke
25af408c85 Merge pull request #2146 from MediaBrowser/dev
Dev
2016-09-08 17:30:47 -04:00
Luke Pulverenti
d2fa3d10af update dialogs 2016-09-08 17:30:19 -04:00
Luke Pulverenti
232b5758f0 update dialogs 2016-09-08 16:32:30 -04:00
Luke Pulverenti
3d4dfadf25 3.1.140 2016-09-08 02:45:02 -04:00
Luke
51f6cd999f Merge pull request #2145 from MediaBrowser/dev
Dev
2016-09-08 02:44:27 -04:00
Luke Pulverenti
323d410484 add option to save recordings as mkv 2016-09-08 02:41:49 -04:00
Luke Pulverenti
efebc78cf5 update prompt dialog 2016-09-08 02:15:44 -04:00
Luke Pulverenti
3a4b0ea018 limit transcoding to level 41 2016-09-07 22:55:54 -04:00
Luke Pulverenti
13004d2541 enable sync for channels that allow downloading 2016-09-07 16:11:34 -04:00
Luke Pulverenti
d68a826833 update dialogs 2016-09-07 13:17:26 -04:00
Luke Pulverenti
51904062dc 3.1.139 2016-09-07 03:11:35 -04:00
Luke
5c021eb7d9 Merge pull request #2144 from MediaBrowser/dev
Dev
2016-09-07 03:11:03 -04:00
Luke Pulverenti
4e0adb17e7 update dialogs 2016-09-07 01:48:14 -04:00
Luke Pulverenti
2a6a6d6911 add additional ignores from librarymonitor 2016-09-06 23:38:01 -04:00
Luke Pulverenti
c3f947f4da add sports and kids recording categories 2016-09-06 13:59:10 -04:00
Luke Pulverenti
8989d8055b 3.1.138 2016-09-06 02:53:04 -04:00
Luke
65c52fc32a Merge pull request #2143 from MediaBrowser/dev
Dev
2016-09-06 02:51:56 -04:00
Luke Pulverenti
d6645c2909 update prompt 2016-09-06 02:50:07 -04:00
Luke Pulverenti
67505e24bd fix artist editor 2016-09-06 01:02:05 -04:00
Luke Pulverenti
c8042fb03e 3.1.137 2016-09-05 16:09:53 -04:00
Luke
357a3c0e30 Merge pull request #2142 from MediaBrowser/dev
add chapter image error handling
2016-09-05 16:08:08 -04:00
Luke Pulverenti
d4324b7e89 add chapter image error handling 2016-09-05 16:07:36 -04:00
Luke Pulverenti
7666886a92 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-09-05 01:46:14 -04:00
Luke Pulverenti
3046510866 3.1.136 2016-09-05 01:45:59 -04:00
Luke
7a7620fbfa Merge pull request #2141 from MediaBrowser/dev
fix profile
2016-09-05 01:45:43 -04:00
Luke Pulverenti
aee22a70d5 3.1.135 2016-09-05 01:41:46 -04:00
Luke
39e7687921 Merge pull request #2140 from MediaBrowser/dev
Dev
2016-09-05 01:40:21 -04:00
Luke Pulverenti
cc7b150b90 update recording layout 2016-09-05 01:39:14 -04:00
Jose Alacan
038cfabca5 Session manager works with the userdata manager not the repository 2016-09-04 21:39:32 -04:00
Jose Alacan
08fb2707be Only usermanager should have access to the userrepository 2016-09-04 21:39:32 -04:00
Luke Pulverenti
22ac006d4e fix missing params 2016-09-04 13:52:43 -04:00