Commit Graph

8976 Commits

Author SHA1 Message Date
Luke
99ad574bb8 Merge pull request #2027 from MediaBrowser/dev
Dev
2016-08-06 00:48:52 -04:00
Luke Pulverenti
0706bd5237 update DirectoryService 2016-08-06 00:48:00 -04:00
Luke Pulverenti
d290a54845 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-08-06 00:38:48 -04:00
Luke Pulverenti
319a956b38 update validators 2016-08-06 00:38:01 -04:00
Luke
fec7c47824 Merge pull request #1932 from softworkz/ReduceWarnings
Reduced compiler warnings. No functional changes.
2016-08-05 20:37:21 -04:00
softworkz
23da61281e Reduced compiler warnings. No functional changes (except MediaEncoder.cs and AutomaticRestartEntryPoint.cs) 2016-08-05 23:15:48 +02:00
Luke Pulverenti
407d82ea11 support mp4 subtitles 2016-08-05 16:35:11 -04:00
Luke Pulverenti
22fc552fc0 remove paper-fab 2016-08-05 16:25:09 -04:00
Luke Pulverenti
bfe746d4e0 3.1.90 2016-08-05 02:14:13 -04:00
Luke
f326e73ab1 Merge pull request #2026 from MediaBrowser/dev
Dev
2016-08-05 02:13:50 -04:00
Luke Pulverenti
8cca5dfb03 fix merge conflict 2016-08-05 02:13:19 -04:00
Luke Pulverenti
386cf95220 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-08-05 02:10:40 -04:00
Luke Pulverenti
79887b2c34 validate encoder presence 2016-08-05 01:12:25 -04:00
Luke
9bd923e2d7 Merge pull request #2024 from softworkz/FixExcepton
Fix IndexOutOfRangeException
2016-08-04 23:02:21 -04:00
softworkz
6cf28f1c4e Fix IndexOutOfRangeException
Fixes situations where the filename is something like "-------".
2016-08-05 04:59:27 +02:00
Luke Pulverenti
97446d04df update SocketHttpListener 2016-08-04 15:05:52 -04:00
Luke Pulverenti
be6e9b2957 support audio db language choice 2016-08-04 12:39:19 -04:00
Luke Pulverenti
329ec93499 fix version 2016-08-04 01:04:13 -04:00
Luke Pulverenti
295d47a487 fix version 2016-08-04 01:03:05 -04:00
Luke
a30465fb70 Merge pull request #2022 from MediaBrowser/master
merge from master
2016-08-04 01:02:07 -04:00
Luke
a995218059 Merge pull request #2021 from MediaBrowser/master
merge from master
2016-08-04 01:01:42 -04:00
Luke
daf2d41c9d Merge pull request #2020 from MediaBrowser/beta
Beta
2016-08-04 01:01:18 -04:00
Luke
a3228edede Merge pull request #2019 from MediaBrowser/dev
fix search menus
2016-08-04 01:01:03 -04:00
Luke Pulverenti
c7798fcd48 3.0.6030 2016-08-04 00:55:45 -04:00
Luke
980b9baeb5 update mac project 2016-08-04 00:54:04 -04:00
Luke
87d7a7d85a Merge pull request #2018 from MediaBrowser/beta
Beta
2016-08-04 00:48:30 -04:00
Luke Pulverenti
73729ca242 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-08-04 00:48:01 -04:00
Luke Pulverenti
0c3b7a33c2 fix merge conflict 2016-08-04 00:47:50 -04:00
Luke Pulverenti
6af3bf94c0 3.1.89 2016-08-04 00:42:56 -04:00
Luke
8e3178ec0f Merge pull request #2017 from MediaBrowser/dev
Dev
2016-08-04 00:42:17 -04:00
Luke Pulverenti
39245133f8 remove people refresh retry 2016-08-04 00:38:58 -04:00
Luke Pulverenti
e08f5d5d61 don't keep retrying when metadata not found 2016-08-03 22:57:11 -04:00
Luke Pulverenti
3e23d32e62 update naming project 2016-08-03 13:26:42 -04:00
Luke Pulverenti
a5e0185da2 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-08-03 03:11:38 -04:00
Luke Pulverenti
b1a731f403 3.1.88 2016-08-03 03:11:26 -04:00
Luke
acef121119 Merge pull request #2014 from MediaBrowser/dev
fix sync methods
2016-08-03 03:08:37 -04:00
Luke Pulverenti
bbdbe79108 fix sync methods 2016-08-03 03:07:57 -04:00
Luke Pulverenti
81a5166cf4 3.1.87 2016-08-03 02:39:28 -04:00
Luke
5c005103b4 Merge pull request #2013 from MediaBrowser/dev
Dev
2016-08-03 02:39:04 -04:00
Luke Pulverenti
a363beb23c update probing 2016-08-03 02:38:27 -04:00
Luke Pulverenti
04d480297d reduce sync db access 2016-08-03 02:38:19 -04:00
Luke Pulverenti
7e1a0baf9b update media probe 2016-08-03 00:33:34 -04:00
Luke Pulverenti
a9cc5d5c44 add MediaMonkey dlna playback fix 2016-08-02 13:07:58 -04:00
Luke Pulverenti
fb6839f5e7 3.1.86 2016-08-02 02:00:17 -04:00
Luke
b90c18b7f3 Merge pull request #2011 from MediaBrowser/dev
Dev
2016-08-02 01:57:21 -04:00
Luke Pulverenti
a308ab8912 update components 2016-08-02 01:55:52 -04:00
Luke Pulverenti
fd53e18ee9 fix sync layout 2016-08-01 14:16:07 -04:00
Luke Pulverenti
c09cd95508 3.1.85 2016-08-01 12:34:58 -04:00
Luke
2e785b1537 Merge pull request #2009 from MediaBrowser/dev
Dev
2016-08-01 12:34:56 -04:00
Luke Pulverenti
5f71a615c4 reduce file system access by dlna manager 2016-08-01 01:08:52 -04:00