Commit Graph

11144 Commits

Author SHA1 Message Date
Luke Pulverenti
c335521859 don't use year in series folder name 2016-09-15 02:38:09 -04:00
Luke Pulverenti
38fec0a74a reduce recording failures 2016-09-15 02:23:39 -04:00
Luke Pulverenti
d95c0e8324 fix web socket session creation 2016-09-14 17:34:19 -04:00
softworkz
896cc59936 Prioritize metadata merging by preferred language 2016-09-14 22:42:24 +02:00
Luke Pulverenti
5728a7f706 3.1.149 2016-09-14 12:24:45 -04:00
Luke
0b0aa85d1f Merge pull request #2170 from MediaBrowser/dev
Dev
2016-09-14 12:22:40 -04:00
Luke Pulverenti
0c95297269 improve resiliency of recording process 2016-09-14 12:21:33 -04:00
Luke Pulverenti
d611d0e717 update translations 2016-09-13 14:29:31 -04:00
Luke Pulverenti
669b296214 3.1.148 2016-09-13 13:50:14 -04:00
Luke
d258ce107d Merge pull request #2168 from MediaBrowser/dev
Dev
2016-09-13 13:49:47 -04:00
Luke Pulverenti
020ceb97d2 update device discovery 2016-09-13 13:49:13 -04:00
Luke Pulverenti
de2aebd673 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-09-13 13:47:32 -04:00
Luke
2406424dac Merge pull request #2167 from uglymagoo/fix_vaapi
fix graphical subtitle transcoding with vaapi
2016-09-13 13:46:21 -04:00
Jan Friedrich
1cf6cfb11c fix graphical subtitle transcoding with vaapi 2016-09-13 18:29:53 +02:00
Luke Pulverenti
42d67db1b8 removed dead code 2016-09-12 17:24:05 -04:00
Luke Pulverenti
32b442d8c9 fix mono build 2016-09-12 15:38:38 -04:00
Luke Pulverenti
2d36b262fe update german ratings 2016-09-12 14:49:34 -04:00
Luke Pulverenti
7ff1bf099f 3.1.147 2016-09-12 14:24:51 -04:00
Luke
480b9c323a Merge pull request #2161 from MediaBrowser/dev
Dev
2016-09-12 14:23:41 -04:00
Luke Pulverenti
151d88f20d encapsulate path substitution 2016-09-12 14:10:09 -04:00
Luke Pulverenti
05cd512e81 3.1.146 2016-09-11 17:26:37 -04:00
Luke
671f44988c Merge pull request #2160 from MediaBrowser/dev
Dev
2016-09-11 17:24:14 -04:00
Luke Pulverenti
e7124e1ec5 reduce uses of paper-checkbox 2016-09-11 17:02:32 -04:00
Luke Pulverenti
0f760af82c move download images in advance option from global to per library 2016-09-11 13:09:10 -04:00
Luke Pulverenti
38213eda84 3.1.145 2016-09-11 12:07:34 -04:00
Luke
00d974ce38 Merge pull request #2159 from MediaBrowser/dev
Dev
2016-09-11 12:07:07 -04:00
Luke Pulverenti
d87cfdb260 update build config 2016-09-11 11:51:04 -04:00
Luke Pulverenti
62d9eb1ec7 rework upnp discovery 2016-09-11 03:33:53 -04:00
Luke Pulverenti
b06d70e882 3.0.7100 2016-09-10 02:12:55 -04:00
Luke Pulverenti
86a8756509 3.1.144 2016-09-10 00:36:18 -04:00
Luke
0f55930c19 Merge pull request #2157 from MediaBrowser/beta
Beta
2016-09-10 00:27:33 -04:00
Luke
dacebf9287 Merge pull request #2156 from MediaBrowser/dev
Dev
2016-09-10 00:26:18 -04:00
Luke Pulverenti
b4217f2800 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-09-09 23:53:10 -04:00
Luke Pulverenti
2d5e1b3c7f fix dialogs 2016-09-09 22:21:00 -04:00
Luke Pulverenti
673b2b9979 3.0.7000 2016-09-09 16:23:08 -04:00
Luke
01c6e2eec9 Merge pull request #2155 from MediaBrowser/beta
Beta
2016-09-09 16:21:33 -04:00
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