Luke Pulverenti
|
16de4de003
|
Merge branch 'dev' into beta
|
9 years ago |
|
Luke Pulverenti
|
1cdb420d2e
|
Merge branch 'beta' into dev
Conflicts:
MediaBrowser.Api/StartupWizardService.cs
MediaBrowser.Model/Configuration/ServerConfiguration.cs
MediaBrowser.Server.Implementations/Dto/DtoService.cs
MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
MediaBrowser.Server.Implementations/Localization/Core/ca.json
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
MediaBrowser.Server.Implementations/packages.config
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/bower.json
MediaBrowser.WebDashboard/dashboard-ui/strings/html/ca.json
MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ca.json
SharedVersion.cs
|
9 years ago |
|
Luke Pulverenti
|
bb26e05e1e
|
update mac project
|
9 years ago |
|
Luke Pulverenti
|
a9eba7099b
|
update naming project
|
9 years ago |
|
Luke Pulverenti
|
f5f2565b58
|
update translations
|
9 years ago |
|
Luke Pulverenti
|
e6b31ac6f4
|
3.0.5821
|
9 years ago |
|
Luke Pulverenti
|
246f10406c
|
update ffmpeg
|
9 years ago |
|
Luke Pulverenti
|
11e5d194b4
|
3.0.5859
|
9 years ago |
|
Luke Pulverenti
|
96120099cb
|
add message for db upgrade
|
9 years ago |
|
Luke Pulverenti
|
54016092d8
|
3.0.5858
|
9 years ago |
|
Luke
|
88d0c2d40a
|
Merge pull request #1429 from MediaBrowser/master
merge from master
|
9 years ago |
|
Luke Pulverenti
|
008522226f
|
3.0.5820
|
9 years ago |
|
Luke Pulverenti
|
37352785ac
|
Merge branch 'beta'
|
9 years ago |
|
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
|
9 years ago |
|
Luke Pulverenti
|
f14e9b8d3a
|
fix merge conflict
|
9 years ago |
|
Luke Pulverenti
|
bd1bde4f13
|
update mac project
|
9 years ago |
|
Luke Pulverenti
|
2b82f0ac51
|
3.0.5857
|
9 years ago |
|
Luke Pulverenti
|
2d7186b97a
|
3.0.5856
|
9 years ago |
|
Luke Pulverenti
|
865e2babfa
|
album refresh fixes
|
9 years ago |
|
Luke Pulverenti
|
025958a22d
|
update interlaced detection
|
9 years ago |
|
Luke Pulverenti
|
4d7c016224
|
album refresh fixes
|
9 years ago |
|
Luke Pulverenti
|
6cb82d6c93
|
fix null reference
|
9 years ago |
|
Luke Pulverenti
|
51df0b79f2
|
update interlaced detection
|
9 years ago |
|
Luke Pulverenti
|
552694bb38
|
3.0.5855
|
9 years ago |
|
Luke Pulverenti
|
0297d8f7d3
|
update locking
|
9 years ago |
|
Luke Pulverenti
|
7ac682f06c
|
use shared slideshow
|
9 years ago |
|
Luke Pulverenti
|
fb91b7c808
|
update locking
|
9 years ago |
|
Luke Pulverenti
|
c2f6e5fefc
|
use shared slideshow
|
9 years ago |
|
Luke Pulverenti
|
a789f1d425
|
3.0.5854
|
9 years ago |
|
Luke Pulverenti
|
77a4c6af94
|
switch to shared paperdialoghelper
|
9 years ago |
|
Luke Pulverenti
|
dc43c1077d
|
merge from dev
|
9 years ago |
|
Luke Pulverenti
|
05a0c28809
|
switch to shared paperdialoghelper
|
9 years ago |
|
Luke Pulverenti
|
6ba51ef495
|
3.0.5853
|
9 years ago |
|
Luke Pulverenti
|
c957ca936f
|
update components
Conflicts:
MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
|
9 years ago |
|
Luke Pulverenti
|
fae9b18481
|
update episode organizer
|
9 years ago |
|
Luke Pulverenti
|
0a43522d15
|
default to include hidden
|
9 years ago |
|
Luke Pulverenti
|
b1c9984498
|
update timer
|
9 years ago |
|
Luke Pulverenti
|
b82b6fc975
|
remove no_accurate seek
|
9 years ago |
|
Luke Pulverenti
|
de30a0e10b
|
remove volume timer from device
|
9 years ago |
|
Luke Pulverenti
|
24b925cb56
|
remove timer from PlayToController
|
9 years ago |
|
Luke Pulverenti
|
00de5b1ca7
|
update use of timers
|
9 years ago |
|
Luke Pulverenti
|
0361b8b0e8
|
don't organize with unknown episode name
|
9 years ago |
|
Luke Pulverenti
|
950912bd03
|
update components
|
9 years ago |
|
Luke Pulverenti
|
fc6d22a81b
|
update episode organizer
|
9 years ago |
|
Luke Pulverenti
|
c47eef0e90
|
default to include hidden
|
9 years ago |
|
Luke Pulverenti
|
e20de8ffad
|
update timer
|
9 years ago |
|
Luke Pulverenti
|
3835657a23
|
remove no_accurate seek
|
9 years ago |
|
Luke Pulverenti
|
f3534a56e2
|
remove volume timer from device
|
9 years ago |
|
Luke Pulverenti
|
a39f263814
|
remove timer from PlayToController
|
9 years ago |
|
Luke Pulverenti
|
47ea69f0de
|
update use of timers
|
9 years ago |
