Commit graph

5738 commits

Author SHA1 Message Date
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 6d3dcd8266 update client sync 2015-09-20 12:16:06 -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
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
Luke Pulverenti dd17096b5d update libs 2015-09-11 22:18:09 -04:00
Luke Pulverenti cd5615c6ce update client sync 2015-09-11 12:26:06 -04:00
Luke Pulverenti baf2f80154 update camera upload 2015-09-10 14:28:22 -04:00
Luke Pulverenti ce0435a66d add movie resolver fix 2015-09-09 23:22:52 -04:00
Luke Pulverenti 38ff6565c6 update sync processes 2015-09-09 13:49:44 -04:00
Luke Pulverenti 0d45ab8d64 adjust default settings 2015-09-08 17:03:31 -04:00
Luke Pulverenti 29caf70fee limit videos for keyframe extraction 2015-09-08 16:40:48 -04:00
Luke Pulverenti 976a4c22da update live tv segments 2015-09-07 21:00:46 -04:00
Luke Pulverenti 046eaa7671 update translations 2015-09-07 11:54:57 -04:00
Luke Pulverenti ff33ebbe73 isolate jqm checkbox 2015-09-06 12:11:41 -04:00
Luke Pulverenti b7af1213a4 fix auto organize 2015-09-06 12:02:41 -04:00
Luke Pulverenti 04aa4965c6 update path fields 2015-09-06 00:53:37 -04:00
Luke Pulverenti 74c1e8e12a update bitrate detection 2015-09-05 17:15:36 -04:00
Luke e9317f3cbc Merge pull request #1173 from Schtek/patch-1
MusicBrainz ids as Vorbis Comments
2015-09-05 14:27:17 -04:00
Luke Pulverenti 27431b888c strip out jqm panel 2015-09-05 14:05:29 -04:00
Luke Pulverenti 462bec451f update version 2015-09-05 13:43:53 -04:00
Luke Pulverenti 7b9e10249a Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev 2015-09-05 13:37:08 -04:00
Luke 6470189756 Merge pull request #1156 from arcticwaters/srt-ssa-wipe
Add support for more ssa tags in SrtParser
2015-09-05 13:30:42 -04:00
Luke 9ba4ea5250 Merge pull request #1172 from MediaBrowser/master
merge
2015-09-05 13:29:22 -04:00