Luke Pulverenti
|
37352785ac
|
Merge branch 'beta'
|
2016-02-01 14:24:15 -05:00 |
|
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
|
4d7c016224
|
album refresh fixes
|
2016-02-01 12:22:02 -05:00 |
|
Luke Pulverenti
|
6cb82d6c93
|
fix null reference
|
2016-02-01 12:03:07 -05:00 |
|
Luke Pulverenti
|
51df0b79f2
|
update interlaced detection
|
2016-02-01 12:02:58 -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
|
fb91b7c808
|
update locking
|
2016-01-31 19:57:40 -05:00 |
|
Luke Pulverenti
|
c2f6e5fefc
|
use shared slideshow
|
2016-01-31 01:03:40 -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
|
05a0c28809
|
switch to shared paperdialoghelper
|
2016-01-30 15:59:09 -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
|
950912bd03
|
update components
|
2016-01-30 13:31:31 -05:00 |
|
Luke Pulverenti
|
fc6d22a81b
|
update episode organizer
|
2016-01-29 23:54:55 -05:00 |
|
Luke Pulverenti
|
c47eef0e90
|
default to include hidden
|
2016-01-29 23:54:42 -05:00 |
|
Luke Pulverenti
|
e20de8ffad
|
update timer
|
2016-01-29 21:42:53 -05:00 |
|
Luke Pulverenti
|
3835657a23
|
remove no_accurate seek
|
2016-01-29 14:52:50 -05:00 |
|
Luke Pulverenti
|
f3534a56e2
|
remove volume timer from device
|
2016-01-29 14:52:39 -05:00 |
|
Luke Pulverenti
|
a39f263814
|
remove timer from PlayToController
|
2016-01-29 14:37:20 -05:00 |
|
Luke Pulverenti
|
47ea69f0de
|
update use of timers
|
2016-01-29 14:20:09 -05:00 |
|
Luke Pulverenti
|
e906bdc06e
|
don't organize with unknown episode name
|
2016-01-29 13:29:09 -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
|
4774a2cc40
|
update network cache
|
2016-01-28 22:45:29 -05:00 |
|
Luke Pulverenti
|
a38cf5566a
|
update recording logging
|
2016-01-28 22:43:20 -05:00 |
|
Luke Pulverenti
|
3268de0edf
|
add null check to PeriodicTimer
|
2016-01-28 22:42:03 -05:00 |
|
Luke Pulverenti
|
3510ef3d2b
|
reduce use of timers throughout the system
|
2016-01-28 22:40:21 -05:00 |
|