Commit Graph

11673 Commits

Author SHA1 Message Date
Luke Pulverenti
9f3389ff07 update mac project 2017-08-22 14:47:53 -04:00
Luke Pulverenti
98fbfca458 update mac project 2017-08-22 14:47:35 -04:00
Luke
cc9feb17c4 update mac project 2017-08-22 14:46:16 -04:00
Luke
325ec18b1d Merge pull request #2838 from MediaBrowser/dev
Dev
2017-08-22 01:41:46 -04:00
Luke Pulverenti
89722aa077 resolve defect with folder rip transcoding 2017-08-22 01:41:20 -04:00
Luke Pulverenti
3c1fe6ff83 add experimental warning for folder rip transcoding 2017-08-22 01:41:02 -04:00
Luke
97c80297cd Merge pull request #2836 from MediaBrowser/dev
Dev
2017-08-20 17:08:09 -04:00
Luke Pulverenti
2e5db767f3 3.2.28.2 2017-08-20 17:07:47 -04:00
Luke Pulverenti
f4765a87cc update m3u tuner 2017-08-20 15:10:00 -04:00
Luke Pulverenti
42816d6c04 3.2.28.0 2017-08-20 15:06:21 -04:00
Luke Pulverenti
9ccdd71f29 fix quick play with play button 2017-08-20 15:06:05 -04:00
Luke
f3e9128c8c Merge pull request #2835 from MediaBrowser/dev
3.2.28.1
2017-08-19 18:56:54 -04:00
Luke Pulverenti
1573cc2491 3.2.28.1 2017-08-19 18:56:32 -04:00
Luke
ead257c392 Merge pull request #2834 from MediaBrowser/dev
update logging
2017-08-19 18:54:24 -04:00
Luke Pulverenti
1c7283791d update logging 2017-08-19 18:54:05 -04:00
Luke
1c494519c1 Merge pull request #2833 from MediaBrowser/dev
Dev
2017-08-19 18:42:31 -04:00
Luke Pulverenti
a02968c568 3.2.27.4 2017-08-19 18:37:55 -04:00
Luke Pulverenti
ae1a547837 update logging 2017-08-19 18:37:30 -04:00
Luke Pulverenti
b783f317fe update live stream management 2017-08-19 18:37:15 -04:00
Luke
ff2f3108ee Merge pull request #2832 from MediaBrowser/beta
Beta
2017-08-19 16:06:14 -04:00
Luke Pulverenti
6b077f3f84 fix merge conflict 2017-08-19 16:06:00 -04:00
Luke Pulverenti
1ad990ad72 update live tv data transfer 2017-08-19 15:43:35 -04:00
Luke Pulverenti
bd31c0175d move LnkShortcutHandler 2017-08-18 15:34:41 -04:00
Luke
c58db90c95 Merge pull request #2827 from MediaBrowser/dev
Dev
2017-08-18 02:04:21 -04:00
Luke Pulverenti
883399caeb 3.2.27.3 2017-08-18 02:03:49 -04:00
Luke Pulverenti
a7dcf7191a add fixes for .net core 2017-08-17 16:19:02 -04:00
Luke Pulverenti
a57c887f7f update components 2017-08-16 13:30:16 -04:00
Luke Pulverenti
56263a9fa2 remove unused libs 2017-08-16 11:42:36 -04:00
Luke Pulverenti
bfcd1b520f merge common implementations and server implementations 2017-08-16 02:43:41 -04:00
Luke
d5a9db3af7 Merge pull request #2825 from MediaBrowser/dev
Dev
2017-08-16 00:04:49 -04:00
Luke Pulverenti
e3531534b8 3.2.27.2 2017-08-16 00:04:26 -04:00
Luke Pulverenti
d2b86edf05 update hdhr channel ids 2017-08-15 23:40:36 -04:00
Luke Pulverenti
77d4791dc2 update version 2017-08-15 23:39:05 -04:00
Luke
292d0bb448 Merge pull request #2824 from MediaBrowser/beta
Beta
2017-08-15 23:38:49 -04:00
Luke Pulverenti
19c3ad643c fix merge conflict 2017-08-15 23:38:25 -04:00
Luke
df084015e2 Merge pull request #2823 from MediaBrowser/dev
fix scrollbars showing up on home screen in firefox
2017-08-15 23:37:27 -04:00
Luke
e42e343a41 Merge pull request #2821 from MediaBrowser/dev
Dev
2017-08-13 16:36:15 -04:00
Luke Pulverenti
ee5fdd4120 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2017-08-13 16:35:45 -04:00
Luke Pulverenti
6e99f798fb 3.2.27.1 2017-08-13 16:35:39 -04:00
Luke Pulverenti
8bd3b9f8d8 3.2.27.0 2017-08-13 16:35:17 -04:00
Luke
f245ce4408 Merge pull request #2820 from MediaBrowser/master
master
2017-08-13 16:33:36 -04:00
Luke
e4aa9b187d Merge pull request #2819 from MediaBrowser/master
master
2017-08-13 16:33:18 -04:00
Luke Pulverenti
9d08144d04 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2017-08-13 16:32:50 -04:00
Luke Pulverenti
df81e5fdbd remove mono sln 2017-08-13 16:32:43 -04:00
Luke
2a194ebf84 Merge pull request #2817 from MediaBrowser/beta
Beta
2017-08-13 16:31:54 -04:00
Luke
fc94896bf7 Merge pull request #2816 from MediaBrowser/dev
update mac project
2017-08-13 16:31:29 -04:00
Luke
a8f894215d update mac project 2017-08-13 16:30:53 -04:00
Luke
dc578f3742 Merge pull request #2815 from MediaBrowser/beta
Beta
2017-08-13 16:21:10 -04:00
Luke Pulverenti
f6ed934a7e fix merge conflict 2017-08-13 16:20:51 -04:00
Luke
7f200f057d Merge pull request #2814 from MediaBrowser/dev
fixes #2798, fixes #2799
2017-08-13 16:15:33 -04:00