Commit Graph

  • 40255e6014 fix merge conflict Luke Pulverenti 2016-10-20 15:27:27 -04:00
  • 3c1114228b 3.1.196 Luke Pulverenti 2016-10-20 14:06:37 -04:00
  • f6afe90acd Merge pull request #2249 from MediaBrowser/dev Luke 2016-10-20 14:04:17 -04:00
  • 821d950234 allow specification of probing support Luke Pulverenti 2016-10-20 14:02:42 -04:00
  • ccaf2f43a6 exclude mpeg4 with level -99 from vaapi Luke Pulverenti 2016-10-20 02:36:34 -04:00
  • 8576a2b2cf 3.1.195 Luke Pulverenti 2016-10-19 16:35:18 -04:00
  • b94f997a33 Merge pull request #2246 from MediaBrowser/dev Luke 2016-10-19 16:32:41 -04:00
  • b1f604b5e7 fix upnp with vlc android Luke Pulverenti 2016-10-19 16:31:46 -04:00
  • 2cbc7d5c65 3.1.194 Luke Pulverenti 2016-10-19 02:33:37 -04:00
  • b9c64d7e8d Merge pull request #2244 from MediaBrowser/dev Luke 2016-10-19 02:32:34 -04:00
  • b7c6ffe013 handle x-png Luke Pulverenti 2016-10-19 02:29:00 -04:00
  • 7895b5457c removed dead code Luke Pulverenti 2016-10-19 02:28:44 -04:00
  • f988413e4b update ssdp handler Luke Pulverenti 2016-10-19 02:27:02 -04:00
  • d43111813e add user agent to m3u requests Luke Pulverenti 2016-10-18 14:35:27 -04:00
  • d000cd4159 remote service restart Luke Pulverenti 2016-10-18 14:30:50 -04:00
  • 2f17d160bc limit number of people in dlna responses Luke Pulverenti 2016-10-18 14:23:41 -04:00
  • 5ad04bbb77 update components Luke Pulverenti 2016-10-18 01:06:48 -04:00
  • dd6f9eb43e update mac Luke 2016-10-17 16:08:47 -04:00
  • 5e8181e34a 3.1.193 Luke Pulverenti 2016-10-17 13:08:10 -04:00
  • 0fd99d2d08 Merge pull request #2242 from MediaBrowser/dev Luke 2016-10-17 12:48:23 -04:00
  • b0a75f086e re-enable split by time Luke Pulverenti 2016-10-17 12:46:49 -04:00
  • 9fb7bd1367 try to fix unhandled exception in file refresher Luke Pulverenti 2016-10-17 12:41:08 -04:00
  • 716aef7e47 update video resolver Luke Pulverenti 2016-10-17 12:40:43 -04:00
  • bba0c564c7 remove dead interface objects Luke Pulverenti 2016-10-17 12:35:29 -04:00
  • b90b64aae8 3.0.8200 Luke Pulverenti 2016-10-17 12:34:11 -04:00
  • fb9db5c3c3 Merge pull request #2240 from MediaBrowser/beta Luke 2016-10-17 12:32:57 -04:00
  • f8a248ffd8 fix merge conflict Luke Pulverenti 2016-10-17 12:32:48 -04:00
  • b0147c32f9 Merge pull request #2241 from MediaBrowser/dev Luke 2016-10-17 12:19:58 -04:00
  • ba613d5671 disable split by time Luke Pulverenti 2016-10-17 12:18:12 -04:00
  • 438871d6f4 3.1.192 Luke Pulverenti 2016-10-16 20:07:51 -04:00
  • 0b70512cdc Merge pull request #2239 from MediaBrowser/dev Luke 2016-10-16 20:07:27 -04:00
  • eb65dd8126 fix video getting marked unplayed when watching Luke Pulverenti 2016-10-16 20:00:13 -04:00
  • 5af8b02013 3.1.191 Luke Pulverenti 2016-10-16 13:16:45 -04:00
  • fa0795b65b Merge pull request #2238 from MediaBrowser/dev Luke 2016-10-16 13:12:31 -04:00
  • 55f47d2120 update recording defaults Luke Pulverenti 2016-10-16 13:11:32 -04:00
  • 401dc39e4c update translations Luke Pulverenti 2016-10-16 12:17:32 -04:00
  • f87f16b6a1 Merge pull request #2237 from MediaBrowser/dev Luke 2016-10-15 18:29:38 -04:00
  • 79463d112c update recording delete Luke Pulverenti 2016-10-15 18:29:16 -04:00
  • e9a0b284fc 3.1.190 Luke Pulverenti 2016-10-15 18:19:18 -04:00
  • 69f5c28bad Merge pull request #2236 from MediaBrowser/dev Luke 2016-10-15 18:17:32 -04:00
  • ac2ca1fec2 update recording dialogs Luke Pulverenti 2016-10-15 18:12:16 -04:00
  • 3d1db18b07 Merge pull request #2234 from MediaBrowser/dev Luke 2016-10-14 12:36:35 -04:00
  • d517aadc1c update project Luke Pulverenti 2016-10-14 12:31:51 -04:00
  • ddd6877624 3.1.189 Luke Pulverenti 2016-10-14 12:28:19 -04:00
  • 68d52b85d1 Merge pull request #2233 from MediaBrowser/dev Luke 2016-10-14 12:25:21 -04:00
  • 360e666cc6 update recording dialogs Luke Pulverenti 2016-10-14 12:22:04 -04:00
  • 734d215940 3.0.8100 Luke Pulverenti 2016-10-13 17:20:36 -04:00
  • 3f438cdf7b Merge pull request #2232 from MediaBrowser/beta Luke 2016-10-13 17:19:50 -04:00
  • 94ddbfd57f fix merge conflict Luke Pulverenti 2016-10-13 17:19:38 -04:00
  • 1c169b5b40 Merge pull request #2231 from MediaBrowser/dev Luke 2016-10-13 17:14:17 -04:00
  • e206725b73 update images Luke Pulverenti 2016-10-13 17:13:30 -04:00
  • 91e877a88e 3.1.188 Luke Pulverenti 2016-10-13 14:45:32 -04:00
  • 61030bb109 Merge pull request #2230 from MediaBrowser/dev Luke 2016-10-13 14:44:51 -04:00
  • b9c430059a fix playlist deletion Luke Pulverenti 2016-10-13 14:43:47 -04:00
  • 2ef130260c Merge pull request #2229 from MediaBrowser/dev Luke 2016-10-13 11:44:32 -04:00
  • cf15c194ae Merge pull request #2228 from MediaBrowser/dev Luke 2016-10-13 11:07:57 -04:00
  • 2095170eed update live tv screens Luke Pulverenti 2016-10-13 11:07:21 -04:00
  • cc6b8f44d1 update RecordingStatus Luke Pulverenti 2016-10-12 17:01:35 -04:00
  • e1f953d517 update mac project Luke Pulverenti 2016-10-12 15:50:30 -04:00
  • 3f7f33bd51 update mac project Luke 2016-10-12 15:49:26 -04:00
  • 673e2c9d0f Merge branch 'master' of https://github.com/MediaBrowser/Emby Luke Pulverenti 2016-10-12 15:44:48 -04:00
  • 3aabe6aa19 3.0.8000 Luke Pulverenti 2016-10-12 15:44:06 -04:00
  • 25ef9777ca Merge pull request #2224 from MediaBrowser/beta Luke 2016-10-12 15:43:28 -04:00
  • 0677d4ec99 fix merge conflict Luke Pulverenti 2016-10-12 15:43:19 -04:00
  • c25179473b 3.0.8000 Luke Pulverenti 2016-10-12 15:41:20 -04:00
  • 54cf4cbb44 fix merge conflict Luke Pulverenti 2016-10-12 15:40:19 -04:00
  • 0fcceecaf6 fix merge conflicts Luke Pulverenti 2016-10-12 15:39:01 -04:00
  • 5be6cf05e3 Merge pull request #2226 from MediaBrowser/dev Luke 2016-10-12 15:35:49 -04:00
  • cc54e0b710 update mac project Luke 2016-10-12 15:35:11 -04:00
  • 94d8ce5d7b Merge pull request #2225 from MediaBrowser/dev Luke 2016-10-12 15:32:20 -04:00
  • 1ce693ab4e update mac solution Luke 2016-10-12 15:31:40 -04:00
  • bab06848dd update mac project Luke 2016-10-12 15:28:11 -04:00
  • 1f1da49c29 update mac project Luke Pulverenti 2016-10-12 15:26:28 -04:00
  • 5f16d862d3 fix merge conflit Luke Pulverenti 2016-10-12 15:14:26 -04:00
  • dbc0aa4064 Merge pull request #2223 from MediaBrowser/dev Luke 2016-10-12 14:51:18 -04:00
  • 4d80124d2e 3.1.187 Luke Pulverenti 2016-10-12 14:32:51 -04:00
  • a6f0ceb78b Merge pull request #2222 from MediaBrowser/dev Luke 2016-10-12 14:32:22 -04:00
  • 038b11702e update playlist content Luke Pulverenti 2016-10-12 14:23:09 -04:00
  • b802a6320e 3.1.186 Luke Pulverenti 2016-10-11 17:39:06 -04:00
  • 2abad94e21 Merge pull request #2220 from MediaBrowser/dev Luke 2016-10-11 17:38:44 -04:00
  • 2c6fc11dcf update live stream sharing Luke Pulverenti 2016-10-11 17:33:38 -04:00
  • 31c4a0e6af 3.1.185 Luke Pulverenti 2016-10-11 02:51:25 -04:00
  • 88150e461c Merge pull request #2219 from MediaBrowser/dev Luke 2016-10-11 02:47:51 -04:00
  • d54f03514d Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev Luke Pulverenti 2016-10-11 02:47:08 -04:00
  • d5b5c8e1a5 update display of active recordings Luke Pulverenti 2016-10-11 02:46:59 -04:00
  • d1f213dbf5 Merge pull request #2218 from hatharry/dev Luke 2016-10-11 00:46:07 -04:00
  • d6862cefd8 Merge branch 'dev' of https://github.com/hatharry/Emby.git hatharry 2016-10-11 17:21:21 +13:00
  • 91225bc968 add retry to service restart hatharry 2016-10-11 17:18:32 +13:00
  • 9b0ac4bde5 Merge pull request #28 from MediaBrowser/dev hatharry 2016-10-11 17:10:00 +13:00
  • 9aab559331 3.1.184 Luke Pulverenti 2016-10-10 14:25:12 -04:00
  • ebdb0753a1 Merge pull request #2217 from MediaBrowser/dev Luke 2016-10-10 14:19:06 -04:00
  • cb26cb9457 update program queries Luke Pulverenti 2016-10-10 14:18:28 -04:00
  • d6310048ed 3.1.183 Luke Pulverenti 2016-10-09 03:22:29 -04:00
  • dbf1e2c27e Merge pull request #2216 from MediaBrowser/dev Luke 2016-10-09 03:20:21 -04:00
  • daaae69df5 add playback of in-progress recordings Luke Pulverenti 2016-10-09 03:18:43 -04:00
  • b3595eab6a update music brainz to fetch overview Luke Pulverenti 2016-10-08 14:51:07 -04:00
  • ce6cbf81df 3.1.182 Luke Pulverenti 2016-10-08 01:59:35 -04:00
  • 82c00b079d Merge pull request #2215 from MediaBrowser/dev Luke 2016-10-08 01:58:15 -04:00
  • 5cd3276775 pass requested fields to data layer Luke Pulverenti 2016-10-08 01:57:38 -04:00
  • e5bb2baa67 3.1.181 Luke Pulverenti 2016-10-07 11:57:42 -04:00