Commit Graph

5769 Commits

Author SHA1 Message Date
Luke Pulverenti
d469e3623e Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-09-22 13:09:37 -04:00
Luke Pulverenti
7ee9bfe867 updated nuget 2015-09-22 13:09:29 -04:00
Eric Reed
253cfcd64b Reroute some calls 2015-09-22 12:41:09 -04:00
Luke Pulverenti
86a084bf5e update build scripts 2015-09-22 12:06:27 -04:00
Luke Pulverenti
71780d401f fix windows restart 2015-09-21 21:05:33 -04:00
Luke Pulverenti
a3f11aac38 update tab fade 2015-09-21 14:39:18 -04:00
Luke Pulverenti
b995cd0228 rework tv tabs 2015-09-21 13:46:02 -04:00
Luke Pulverenti
97d051e437 restore changes 2015-09-21 12:26:05 -04:00
Luke
4e4bf3352d Merge pull request #1190 from MediaBrowser/master
merge from master
2015-09-21 12:23:41 -04:00
Luke Pulverenti
7876ee06d9 fix merge 2015-09-21 12:23:20 -04:00
Luke Pulverenti
e90072b75f update offline detection 2015-09-21 11:43:10 -04:00
Luke Pulverenti
11754a2fb2 3.0.5724.5 2015-09-21 11:18:26 -04:00
Luke Pulverenti
671b861193 update embytv 2015-09-21 11:18:14 -04:00
Luke Pulverenti
f2689c4a5a Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-09-20 13:56:41 -04:00
Luke Pulverenti
959ac9d727 restore changes 2015-09-20 13:56:26 -04:00
Luke
200883a551 Merge pull request #1187 from MediaBrowser/master
Add changes from dev
2015-09-20 13:36:31 -04:00
Luke Pulverenti
d3b8557ab6 update merge 2015-09-20 13:36:09 -04:00
Luke Pulverenti
4492dcc592 update merge 2015-09-20 13:34:05 -04:00
Luke Pulverenti
25c37e40ad update merge 2015-09-20 13:28:32 -04:00
Luke Pulverenti
543cf723ef fix merge conflict 2015-09-20 13:24:58 -04:00
Luke Pulverenti
7c7f05e6e2 fix merge conflict 2015-09-20 13:23:37 -04:00
Luke Pulverenti
e8010955dc fix merge conflicts 2015-09-20 13:22:34 -04:00
Luke Pulverenti
fe430acfc9 fix stream copy decisions 2015-09-20 12:42:11 -04:00
Luke Pulverenti
6d3dcd8266 update client sync 2015-09-20 12:16:06 -04:00
Luke Pulverenti
4fb8938d09 update video frame analysis setting 2015-09-20 12:15:25 -04:00
Luke Pulverenti
b5fafa8119 fix external subs 2015-09-20 11:59:40 -04:00
Luke Pulverenti
02d9b7872e fix ffprobe for linux 2015-09-20 11:59:19 -04:00
Luke Pulverenti
b604683583 update StreamBuilder 2015-09-20 11:48:44 -04:00
Luke Pulverenti
9db6f610c6 add image processor delay 2015-09-20 11:39:44 -04:00
Luke Pulverenti
317c6bcd68 update mime types 2015-09-20 11:37:39 -04:00
Luke Pulverenti
63b62e5f40 support multi-form data for camera upload 2015-09-20 11:35:52 -04:00
Luke Pulverenti
b0fffc9249 update IntervalTrigger 2015-09-20 11:30:26 -04:00
Luke Pulverenti
11d22aba5a add IgnoreDataMember to MusicAlbum 2015-09-20 11:29:41 -04:00
Luke Pulverenti
3a900f9d90 fix id parsing in MovieResolver 2015-09-20 11:29:29 -04:00
Luke Pulverenti
718545a79b update metadata editor 2015-09-19 22:06:56 -04:00
Luke
c3d6c19cc3 Merge pull request #1182 from hmflash/fix-ffprobe-argumentexception
Fix ffprobe keyframe detection on linux
2015-09-18 17:15:57 -04:00
Luke Pulverenti
aff7309a08 update ffmpeg with qsv-compatible version 2015-09-18 13:50:24 -04:00
Luke Pulverenti
5340bfe8da added setting for intel qsv hardware decoding 2015-09-17 23:08:45 -04:00
Luke Pulverenti
2acd1665c9 update series timers 2015-09-17 21:51:22 -04:00
Luke Pulverenti
8a4f86aefe rework image editor 2015-09-17 13:24:23 -04:00
Luke Pulverenti
346e48447e begin rework of image editor 2015-09-17 12:04:04 -04:00
Luke Pulverenti
9100bcbaf7 update subtitle editor 2015-09-17 00:19:15 -04:00
Luke Pulverenti
42651e2938 update translations 2015-09-16 22:33:45 -04:00
Luke Pulverenti
29923506ca rework subtitle editor 2015-09-16 21:33:46 -04:00
Luke Pulverenti
a4a3a54dad update collections 2015-09-16 13:44:34 -04:00
Luke Pulverenti
9ae7625d13 update item list page 2015-09-16 13:16:39 -04:00
Luke Pulverenti
a2c371ec60 rework collection editor 2015-09-15 23:55:26 -04:00
Luke Pulverenti
a0fa1b5f8f update client sync 2015-09-15 14:09:44 -04:00
Luke Pulverenti
6d3fda8693 more client sync stubs 2015-09-15 00:31:12 -04:00
Seth Hinze
4dc5d901b6 Split ffprobe output on CRLF or LF. 2015-09-14 19:28:29 -07:00