Luke Pulverenti
|
f5ebeddbf5
|
Merge branch 'master' into beta
Conflicts:
MediaBrowser.Providers/People/MovieDbPersonProvider.cs
MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-apiclient/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/scripts/librarybrowser.js
MediaBrowser.WebDashboard/dashboard-ui/scripts/site.js
|
2016-02-01 14:23:58 -05:00 |
|
Luke Pulverenti
|
f14e9b8d3a
|
fix merge conflict
|
2016-02-01 14:21:22 -05:00 |
|
Luke Pulverenti
|
bd1bde4f13
|
update mac project
|
2016-02-01 14:17:35 -05:00 |
|
Luke Pulverenti
|
2b82f0ac51
|
3.0.5857
|
2016-02-01 14:14:00 -05:00 |
|
Luke Pulverenti
|
2d7186b97a
|
3.0.5856
|
2016-02-01 12:25:33 -05:00 |
|
Luke Pulverenti
|
865e2babfa
|
album refresh fixes
|
2016-02-01 12:24:05 -05:00 |
|
Luke Pulverenti
|
025958a22d
|
update interlaced detection
|
2016-02-01 12:23:54 -05:00 |
|
Luke Pulverenti
|
552694bb38
|
3.0.5855
|
2016-01-31 20:02:23 -05:00 |
|
Luke Pulverenti
|
0297d8f7d3
|
update locking
|
2016-01-31 20:00:04 -05:00 |
|
Luke Pulverenti
|
7ac682f06c
|
use shared slideshow
|
2016-01-31 19:59:54 -05:00 |
|
Luke Pulverenti
|
a789f1d425
|
3.0.5854
|
2016-01-30 16:34:28 -05:00 |
|
Luke Pulverenti
|
77a4c6af94
|
switch to shared paperdialoghelper
|
2016-01-30 16:33:24 -05:00 |
|
Luke Pulverenti
|
dc43c1077d
|
merge from dev
|
2016-01-30 16:32:58 -05:00 |
|
Luke Pulverenti
|
6ba51ef495
|
3.0.5853
|
2016-01-30 13:55:26 -05:00 |
|
Luke Pulverenti
|
c957ca936f
|
update components
Conflicts:
MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
|
2016-01-30 13:51:20 -05:00 |
|
Luke Pulverenti
|
fae9b18481
|
update episode organizer
|
2016-01-30 13:50:51 -05:00 |
|
Luke Pulverenti
|
0a43522d15
|
default to include hidden
|
2016-01-30 13:50:41 -05:00 |
|
Luke Pulverenti
|
b1c9984498
|
update timer
|
2016-01-30 13:49:50 -05:00 |
|
Luke Pulverenti
|
b82b6fc975
|
remove no_accurate seek
|
2016-01-30 13:49:40 -05:00 |
|
Luke Pulverenti
|
de30a0e10b
|
remove volume timer from device
|
2016-01-30 13:49:29 -05:00 |
|
Luke Pulverenti
|
24b925cb56
|
remove timer from PlayToController
|
2016-01-30 13:49:21 -05:00 |
|
Luke Pulverenti
|
00de5b1ca7
|
update use of timers
|
2016-01-30 13:49:12 -05:00 |
|
Luke Pulverenti
|
0361b8b0e8
|
don't organize with unknown episode name
|
2016-01-30 13:49:03 -05:00 |
|
Luke Pulverenti
|
933a166424
|
3.0.5852
|
2016-01-29 00:18:23 -05:00 |
|
Luke Pulverenti
|
22bfa9ca82
|
merge from dev
|
2016-01-29 00:18:05 -05:00 |
|
Luke Pulverenti
|
352595bc16
|
add null check to PeriodicTimer
|
2016-01-29 00:17:35 -05:00 |
|
Luke Pulverenti
|
cfa8f6c6ec
|
reduce use of timers throughout the system
Conflicts:
MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
|
2016-01-29 00:17:20 -05:00 |
|
Luke Pulverenti
|
51899f1880
|
fixes #1218 - Dlna server doesn't work after resuming to sleep.
|
2016-01-29 00:16:41 -05:00 |
|
Luke Pulverenti
|
83d96f9bda
|
update network cache
Conflicts:
MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
|
2016-01-29 00:16:21 -05:00 |
|
Luke Pulverenti
|
74d85e8b19
|
update recording logging
|
2016-01-29 00:14:57 -05:00 |
|
Luke Pulverenti
|
a72c26d891
|
3.0.5851
|
2016-01-28 21:27:19 -05:00 |
|
Luke Pulverenti
|
5763ce5a42
|
catch BDInfo errors
|
2016-01-28 21:26:46 -05:00 |
|
Luke Pulverenti
|
f08084920c
|
3.0.5850
|
2016-01-28 15:13:01 -05:00 |
|
Luke Pulverenti
|
9d6f1a8b61
|
update recording logging
|
2016-01-28 14:18:47 -05:00 |
|
Luke Pulverenti
|
258b07a416
|
handle empty person name
|
2016-01-28 14:18:38 -05:00 |
|
Luke Pulverenti
|
2d97423a40
|
don't organize episode if series has no provider ids
|
2016-01-28 14:18:30 -05:00 |
|
Luke Pulverenti
|
af599ed5d7
|
add logging
|
2016-01-28 14:17:52 -05:00 |
|
Luke Pulverenti
|
8a50392ba7
|
reduce server pinging
|
2016-01-28 14:17:38 -05:00 |
|
Luke Pulverenti
|
8c7296b560
|
update translations
|
2016-01-28 14:16:26 -05:00 |
|
Luke Pulverenti
|
9dd55c15c0
|
fix changing added value
|
2016-01-28 14:16:16 -05:00 |
|
Luke Pulverenti
|
f0adb2e891
|
restore channel view setting
|
2016-01-28 14:16:06 -05:00 |
|
Luke Pulverenti
|
2bd0464322
|
fixes #1410 - Entire server locks up, when files are locked during.. things..
|
2016-01-27 13:44:42 -05:00 |
|
Luke Pulverenti
|
ddf7fdbcef
|
fixes #1421 - LogRequest() in WebSocketSharpListener broken for Reports
|
2016-01-27 13:44:32 -05:00 |
|
Luke Pulverenti
|
c167f79238
|
update photo resolver to exclude generated images
|
2016-01-27 13:44:23 -05:00 |
|
Luke Pulverenti
|
2b8cf9b89d
|
add logging
|
2016-01-27 12:14:48 -05:00 |
|
Luke Pulverenti
|
106a2f3e1a
|
add back MergeMetadataAndImagesByName
Conflicts:
MediaBrowser.Model/Configuration/ServerConfiguration.cs
|
2016-01-27 01:33:59 -05:00 |
|
Luke Pulverenti
|
c48a4cfb99
|
remove xml savers
|
2016-01-27 01:14:56 -05:00 |
|
Luke Pulverenti
|
51cd5e90b0
|
restart timers on wake
|
2016-01-27 01:11:20 -05:00 |
|
Luke Pulverenti
|
9a83394e5d
|
disable wake timer
|
2016-01-27 01:11:10 -05:00 |
|
Luke Pulverenti
|
1ea2ec9bdc
|
support itunes episode naming
|
2016-01-27 01:10:29 -05:00 |
|