Commit Graph

11074 Commits

Author SHA1 Message Date
Luke Pulverenti
9d216c79bb 3.2.18.1 2017-05-31 15:43:35 -04:00
Luke
e08e3e9c81 Merge pull request #2680 from MediaBrowser/master
master
2017-05-31 15:42:29 -04:00
Luke Pulverenti
3aaf68902c fix merge conflict 2017-05-31 15:41:54 -04:00
Luke
276003564e Merge pull request #2678 from MediaBrowser/beta
Beta
2017-05-31 15:41:04 -04:00
Luke
91176d9ccc Merge pull request #2677 from MediaBrowser/beta
Beta
2017-05-31 15:40:34 -04:00
Luke Pulverenti
c37c9a7507 fix merge conflict 2017-05-31 15:40:15 -04:00
Luke
4e10daf646 Merge pull request #2676 from MediaBrowser/dev
Dev
2017-05-31 15:28:03 -04:00
Luke Pulverenti
5bfcbd4e9e update dlna profiles 2017-05-31 15:21:32 -04:00
Luke
6c5fe7935b Merge pull request #2675 from MediaBrowser/dev
Dev
2017-05-30 16:55:57 -04:00
Luke Pulverenti
d8ec7109ab add FindByPath error handling 2017-05-30 14:24:50 -04:00
Luke
9f094322f7 Merge pull request #2673 from MediaBrowser/dev
update project files
2017-05-29 22:45:18 -04:00
Luke Pulverenti
01843ad4c3 update project files 2017-05-29 22:44:54 -04:00
Luke
1ccab75cd0 Merge pull request #2672 from MediaBrowser/dev
Dev
2017-05-29 22:42:48 -04:00
Luke Pulverenti
7a41ef1245 3.2.17.20 2017-05-29 22:42:01 -04:00
Luke Pulverenti
3c82d8540b update sortname generation 2017-05-29 20:44:48 -04:00
Luke
b51c2d9eca Merge pull request #2671 from MediaBrowser/dev
Dev
2017-05-29 16:18:10 -04:00
Luke Pulverenti
8da3a3680c 3.2.17.19 2017-05-29 16:17:41 -04:00
Luke
7ef861e19d update mac project 2017-05-29 16:07:05 -04:00
Luke Pulverenti
c7c3622d61 update packages 2017-05-29 16:06:00 -04:00
Luke Pulverenti
7ee4998b78 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2017-05-29 15:58:40 -04:00
Luke Pulverenti
23c280ec18 update mac project 2017-05-29 15:58:22 -04:00
Luke
4722f36b69 update mac project 2017-05-29 15:55:37 -04:00
Luke
0984dd2a4a update mac project 2017-05-29 15:51:05 -04:00
Luke Pulverenti
454a29697e update skia 2017-05-29 13:43:28 -04:00
Luke Pulverenti
e456df546c update nlog 2017-05-29 13:31:31 -04:00
Luke
1753225b80 Merge pull request #2668 from MediaBrowser/dev
Dev
2017-05-29 08:37:59 -04:00
Luke Pulverenti
196b526a53 3.2.17.18 2017-05-29 08:37:31 -04:00
Luke Pulverenti
3e15b28b18 add IsInterlaced param 2017-05-29 08:35:59 -04:00
Luke Pulverenti
316b1c9b7b update play queue 2017-05-28 11:56:12 -04:00
Luke
772fb88aab Merge pull request #2667 from MediaBrowser/dev
Dev
2017-05-27 07:42:49 -04:00
Luke Pulverenti
a76bbcfebe 3.2.17.17 2017-05-27 07:42:25 -04:00
Luke Pulverenti
ffb68b0318 update realtime monitor 2017-05-27 03:19:09 -04:00
Luke
84077e824d Merge pull request #2666 from MediaBrowser/dev
Dev
2017-05-26 12:25:43 -04:00
Luke Pulverenti
89ba154522 3.2.17.16 2017-05-26 12:25:07 -04:00
Luke Pulverenti
96341b2179 update libs 2017-05-26 12:24:36 -04:00
Luke Pulverenti
33014f77aa update GetItems method 2017-05-26 02:48:54 -04:00
Luke Pulverenti
d21e8d3c33 update tasks 2017-05-25 14:18:19 -04:00
Luke
40bc3b7b22 Merge pull request #2664 from MediaBrowser/dev
Dev
2017-05-25 09:00:55 -04:00
Luke Pulverenti
b527e56ec3 3.2.17.15 2017-05-25 09:00:33 -04:00
Luke Pulverenti
28988b056c update stream copying 2017-05-25 09:00:14 -04:00
Luke
2715db6ad7 Merge pull request #2662 from MediaBrowser/dev
Dev
2017-05-25 00:26:34 -04:00
Luke Pulverenti
d035d7eaec 3.2.17.14 2017-05-25 00:26:06 -04:00
Luke Pulverenti
b9be73789b fix plugin loading 2017-05-25 00:25:51 -04:00
Luke
5652f25348 Merge pull request #2661 from MediaBrowser/dev
3.2.17.13
2017-05-24 16:46:21 -04:00
Luke Pulverenti
7470dfe61b 3.2.17.13 2017-05-24 16:45:49 -04:00
Luke
9bad9d7601 Merge pull request #2660 from MediaBrowser/dev
removed dead files
2017-05-24 15:54:20 -04:00
Luke Pulverenti
fbbb50496a removed dead files 2017-05-24 15:53:58 -04:00
Luke
51088d6a25 Merge pull request #2659 from MediaBrowser/dev
fix tests
2017-05-24 15:44:28 -04:00
Luke Pulverenti
180c33567b fix tests 2017-05-24 15:44:08 -04:00
Luke
ff19fd971c Merge pull request #2658 from MediaBrowser/dev
Dev
2017-05-24 15:40:25 -04:00