Commit graph

5957 commits

Author SHA1 Message Date
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
Thomas Gillen 6d25610d53 Fix not initialising structs properly 2015-09-19 23:56:59 +01:00
Thomas Gillen 556b34d000 Re-designed item identity providers 2015-09-19 22:25:19 +01: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
Luke Pulverenti 4c050bc3f8 update client sync 2015-09-14 21:16:31 -04:00
Luke Pulverenti 6de0f0f33f update client sync 2015-09-14 15:47:03 -04:00
Luke Pulverenti 11d7585aa3 use taglibsharp to read image sizes 2015-09-14 13:39:35 -04:00
Luke Pulverenti 960d45587d update views 2015-09-14 13:28:42 -04:00
Luke Pulverenti 3ed1ac10cb update docs 2015-09-14 08:50:37 -04:00
Luke Pulverenti f346997992 update translations 2015-09-13 20:43:29 -04:00
Luke Pulverenti 060b42eb7d update project 2015-09-13 20:39:40 -04:00
Luke Pulverenti 8cf45a3e4a add more methods to IFileSystem 2015-09-13 19:07:54 -04:00
Luke Pulverenti 6cb184fcf8 Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev 2015-09-13 17:33:49 -04:00
Luke Pulverenti 21a2160fca update tuner pooling 2015-09-13 17:33:46 -04:00
Luke 14de062681 update file system methods 2015-09-13 17:32:02 -04:00
Luke Pulverenti 0f743205c4 update external subs 2015-09-12 12:39:24 -04:00