Commit Graph

  • 025905a3e4 fix merge conflict Luke Pulverenti 2016-12-18 00:44:21 -05:00
  • 54d5b71577 restore version Luke Pulverenti 2016-12-18 00:43:53 -05:00
  • 4853e795d7 fix merge conflict Luke Pulverenti 2016-12-18 00:43:37 -05:00
  • bc58e2862c fix merge conflicts Luke Pulverenti 2016-12-18 00:43:11 -05:00
  • e7e0a1ecfc fix merge conflict Luke Pulverenti 2016-12-18 00:42:21 -05:00
  • ae1110219d fix merge conflicts Luke Pulverenti 2016-12-18 00:35:28 -05:00
  • aaa027f322 Merge pull request #2349 from MediaBrowser/dev Luke 2016-12-18 00:26:20 -05:00
  • 38b26acd87 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev Luke Pulverenti 2016-12-18 00:25:13 -05:00
  • fb8e3f0843 speed up timer query by id Luke Pulverenti 2016-12-18 00:25:06 -05:00
  • d63e4f5573 update mac project Luke 2016-12-18 00:11:30 -05:00
  • f4b3ad24e0 3.1.259 Luke Pulverenti 2016-12-18 00:09:12 -05:00
  • 0a7b5861b6 Merge pull request #2348 from MediaBrowser/dev Luke 2016-12-18 00:08:53 -05:00
  • bc6d28222a Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev Luke Pulverenti 2016-12-17 23:58:35 -05:00
  • 2d09c187cc redesign series timer edit screen Luke Pulverenti 2016-12-17 23:58:20 -05:00
  • a25fb37c80 update mac project Luke 2016-12-17 21:48:00 -05:00
  • 3c586ac7e0 3.1.258 Luke Pulverenti 2016-12-17 21:37:25 -05:00
  • 03acdc7cc9 Merge pull request #2347 from MediaBrowser/dev Luke 2016-12-17 21:35:57 -05:00
  • c99fa9a651 update timer images Luke Pulverenti 2016-12-17 21:35:21 -05:00
  • 2481c5d9f8 fix boxset socket events Luke Pulverenti 2016-12-17 15:52:05 -05:00
  • 5666049e57 3.1.257 Luke Pulverenti 2016-12-17 03:59:04 -05:00
  • 799fbd6f32 Merge pull request #2346 from MediaBrowser/dev Luke 2016-12-17 03:30:26 -05:00
  • cc73830cd6 fix music album image inheritance Luke Pulverenti 2016-12-17 03:27:41 -05:00
  • 12f46d961b Merge pull request #2345 from MediaBrowser/dev Luke 2016-12-17 01:49:02 -05:00
  • ef490818d7 update dlna default user Luke Pulverenti 2016-12-16 00:24:33 -05:00
  • 7c6ebe9b21 update components Luke Pulverenti 2016-12-15 23:05:22 -05:00
  • 0091d2c51e update components Luke Pulverenti 2016-12-15 23:02:52 -05:00
  • 973749bb99 update components Luke Pulverenti 2016-12-15 22:15:34 -05:00
  • 7a67cb5498 3.1.256 Luke Pulverenti 2016-12-15 15:35:24 -05:00
  • 8404c30997 Merge pull request #2344 from MediaBrowser/dev Luke 2016-12-15 15:26:02 -05:00
  • 7e761df3cb fix userviews for androidtv Luke Pulverenti 2016-12-15 15:23:10 -05:00
  • b0b65b17a4 Merge pull request #2343 from MediaBrowser/dev Luke 2016-12-15 15:07:15 -05:00
  • 988c898fc1 support timeshifting with safari mac and edge mobile Luke Pulverenti 2016-12-15 15:03:57 -05:00
  • 7708d96b8b improve Play To device detection Luke Pulverenti 2016-12-15 02:12:52 -05:00
  • 3674a65fae stop guide refresh when needed Luke Pulverenti 2016-12-15 01:41:10 -05:00
  • 612e85fe91 3.1.255 Luke Pulverenti 2016-12-14 16:02:03 -05:00
  • 4cc15a8919 Merge pull request #2342 from MediaBrowser/dev Luke 2016-12-14 16:01:33 -05:00
  • de9cd28a79 remove tvos dts hack no longer needed Luke Pulverenti 2016-12-14 15:58:55 -05:00
  • 524e7facc8 fix socket errors on linux under .net core Luke Pulverenti 2016-12-13 18:38:26 -05:00
  • 96e6b519b9 Merge pull request #2341 from MediaBrowser/dev Luke 2016-12-13 13:42:05 -05:00
  • dcd06597a7 add missing files Luke Pulverenti 2016-12-13 13:41:36 -05:00
  • 7faf8ca1ec 3.1.254 Luke Pulverenti 2016-12-13 13:28:22 -05:00
  • 6cdbb25b9d Merge pull request #2340 from MediaBrowser/dev Luke 2016-12-13 13:27:53 -05:00
  • ffad9c27e4 automatically adjust timer schedules to program changes Luke Pulverenti 2016-12-13 13:23:03 -05:00
  • afabbfa22b add ios dts workaround Luke Pulverenti 2016-12-13 12:04:37 -05:00
  • 81d685b882 update db connections Luke Pulverenti 2016-12-13 10:44:34 -05:00
  • 71854c1a09 update connection process Luke Pulverenti 2016-12-13 03:45:04 -05:00
  • e1b880a5a0 update series queries Luke Pulverenti 2016-12-13 02:36:30 -05:00
  • bff0cd4447 update next up query Luke Pulverenti 2016-12-12 17:43:07 -05:00
  • 6fe933fde4 improve network address detection Luke Pulverenti 2016-12-12 16:33:37 -05:00
  • 87c9f26e65 update similar queries Luke Pulverenti 2016-12-12 15:46:45 -05:00
  • b33dcdf7bd 3.1.253 Luke Pulverenti 2016-12-12 14:41:18 -05:00
  • acf71527b5 Merge pull request #2339 from MediaBrowser/dev Luke 2016-12-12 14:40:54 -05:00
  • d84bb7160f update next up queries Luke Pulverenti 2016-12-12 14:40:27 -05:00
  • c2d0fd9985 update season queries Luke Pulverenti 2016-12-12 03:53:25 -05:00
  • 73e7f20823 3.1.252 Luke Pulverenti 2016-12-12 00:55:58 -05:00
  • d6d0bc7164 Merge pull request #2337 from MediaBrowser/dev Luke 2016-12-12 00:52:57 -05:00
  • 1aff48b93b move book support into the core Luke Pulverenti 2016-12-12 00:49:19 -05:00
  • 95b3e08d4b 3.1.251 Luke Pulverenti 2016-12-11 01:49:05 -05:00
  • 446b2e29d0 Merge pull request #2336 from MediaBrowser/dev Luke 2016-12-11 01:47:54 -05:00
  • a8d9a3440d Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev Luke Pulverenti 2016-12-11 00:27:43 -05:00
  • 2e26efc9af update hls Luke Pulverenti 2016-12-11 00:27:32 -05:00
  • 71919dcc05 update components Luke Pulverenti 2016-12-11 00:27:08 -05:00
  • 7669e821f1 update db locks Luke Pulverenti 2016-12-11 00:17:04 -05:00
  • a9a808a9c4 fix db locking errors Luke Pulverenti 2016-12-11 00:12:00 -05:00
  • 0c2489059d update sync scripts Luke Pulverenti 2016-12-10 02:16:15 -05:00
  • 2abb63f2bb update mac project Luke 2016-12-09 21:19:47 -05:00
  • 56ba0c5b5d 3.1.250 Luke Pulverenti 2016-12-09 21:03:00 -05:00
  • c79706efe5 Merge pull request #2334 from MediaBrowser/dev Luke 2016-12-09 21:02:33 -05:00
  • e936f49518 update use of shellexecute Luke Pulverenti 2016-12-09 20:58:52 -05:00
  • c7d520555b update dlna profiles Luke Pulverenti 2016-12-09 02:23:09 -05:00
  • 56fb08eeed added delete helper Luke Pulverenti 2016-12-08 10:40:20 -05:00
  • 003650f2d6 3.1.249 Luke Pulverenti 2016-12-08 01:54:33 -05:00
  • 862018b5c2 Merge pull request #2333 from MediaBrowser/dev Luke 2016-12-08 01:54:16 -05:00
  • 9ed3c31175 update recording params Luke Pulverenti 2016-12-08 01:53:46 -05:00
  • c2da52914c add SeriesStudioInfo object Luke Pulverenti 2016-12-08 00:58:38 -05:00
  • 21816ff63e trim excess logging Luke Pulverenti 2016-12-08 00:56:46 -05:00
  • 63a69cdc60 improve m3u channel list parsing Luke Pulverenti 2016-12-07 15:03:00 -05:00
  • 0130209cdc improve ipv6 error handling Luke Pulverenti 2016-12-07 15:02:34 -05:00
  • fa6b90eb74 3.1.248 Luke Pulverenti 2016-12-06 13:05:41 -05:00
  • dd4839a175 Merge pull request #2332 from MediaBrowser/dev Luke 2016-12-06 13:05:16 -05:00
  • 20c2499797 update movie nfo saver Luke Pulverenti 2016-12-06 13:04:53 -05:00
  • 016d8301f5 update series queries Luke Pulverenti 2016-12-06 03:24:29 -05:00
  • 313a21a365 Merge pull request #2331 from MediaBrowser/dev Luke 2016-12-05 13:53:56 -05:00
  • e9a3690079 fix bluray detection Luke Pulverenti 2016-12-05 13:53:35 -05:00
  • 8206fb707b 3.1.247 Luke Pulverenti 2016-12-05 13:47:33 -05:00
  • d0af746823 Merge pull request #2330 from MediaBrowser/dev Luke 2016-12-05 13:47:07 -05:00
  • 9accc3b025 update recording fields Luke Pulverenti 2016-12-05 13:46:38 -05:00
  • 7486aca526 3.1.246 Luke Pulverenti 2016-12-04 17:02:37 -05:00
  • 06a8b8af88 Merge pull request #2329 from MediaBrowser/dev Luke 2016-12-04 17:02:21 -05:00
  • 8c8f2aaba5 first pass at binding to multiple network addresses Luke Pulverenti 2016-12-04 16:55:02 -05:00
  • 598f1cf2bd update url matching Luke Pulverenti 2016-12-04 16:54:45 -05:00
  • ef94bab432 fix bluray folder resolver Luke Pulverenti 2016-12-04 16:31:18 -05:00
  • 0c7bde0aad add user agent to xmltv requests Luke Pulverenti 2016-12-04 16:31:05 -05:00
  • 401a6b8f4a add request logging Luke Pulverenti 2016-12-04 16:30:38 -05:00
  • f04b733996 3.1.245 Luke Pulverenti 2016-12-03 19:19:17 -05:00
  • 9f76369150 Merge pull request #2327 from MediaBrowser/dev Luke 2016-12-03 19:18:51 -05:00
  • 7ed6c67db0 update xml parsing Luke Pulverenti 2016-12-03 18:57:34 -05:00
  • 83ad945015 update xml readers Luke Pulverenti 2016-12-03 16:46:06 -05:00
  • c14dc5686d 3.1.244 Luke Pulverenti 2016-12-03 15:01:48 -05:00
  • e455af7c5c Merge pull request #2325 from MediaBrowser/dev Luke 2016-12-03 15:01:21 -05:00