Commit Graph

3676 Commits

Author SHA1 Message Date
Luke Pulverenti
4a467a2676 add warning about qsv 2016-02-04 23:56:07 -05:00
softworkz
15a66799a8 Merge fixes 2016-02-05 05:21:59 +01:00
softworkz
a252b74db2 Auto-Organize: Added feature to remember/persist series matching in manual organization dialog #2
When a filename cannot be auto-matched to an existing series name, the
organization must be performed manually.
Unfortunately not just once, but again and again for each episode coming
in.
This change proposes a simple but solid method to optionally persist the
matching condition from within the manual organization dialog.
This approach will make Emby "learn" how to organize files in the future
without user interaction.
2016-02-05 05:21:25 +01:00
Luke Pulverenti
bb21de5aed add credentials to audio/video elements 2016-02-04 22:44:56 -05:00
Luke Pulverenti
95b1778220 update components 2016-02-04 22:44:29 -05:00
Luke Pulverenti
adb3a60373 use shared prompt 2016-02-04 15:51:13 -05:00
Luke Pulverenti
0f9f28308c update components 2016-02-04 13:23:09 -05:00
Luke Pulverenti
be5906a13e update components
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/CHANGELOG.md
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/LICENSE
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-core.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-core.min.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-jsx.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-jsx.min.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/package.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/file-highlight/prism-file-highlight.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/file-highlight/prism-file-highlight.min.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-invisibles/prism-show-invisibles.css
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-invisibles/prism-show-invisibles.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-invisibles/prism-show-invisibles.min.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-language/prism-show-language.css
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-language/prism-show-language.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-language/prism-show-language.min.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/wpd/prism-wpd.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/wpd/prism-wpd.min.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/prism.js
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-coy.css
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-dark.css
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-funky.css
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-okaidia.css
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-tomorrow.css
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-twilight.css
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism.css
2016-02-04 13:22:29 -05:00
Luke Pulverenti
df4c86218e update sync button visibility 2016-02-04 13:20:33 -05:00
Luke Pulverenti
4c2a7ed02d update components 2016-02-04 13:19:10 -05:00
Luke Pulverenti
5973359f39 update sync button visibility 2016-02-03 19:04:59 -05:00
Luke Pulverenti
cf577ba8eb update components 2016-02-03 18:00:01 -05:00
Luke Pulverenti
59ea1c2f7d remove unneeded libs 2016-02-02 22:15:42 -05:00
Luke Pulverenti
e0e1d71bd4 removed dead code 2016-02-02 21:54:40 -05:00
Luke Pulverenti
63664e6c1c update components 2016-02-02 21:54:30 -05:00
Luke Pulverenti
2a4b879c21 update components 2016-02-02 21:54:10 -05:00
Luke Pulverenti
8d9ac6ef88 update subtitle focus 2016-02-02 21:54:00 -05:00
Luke Pulverenti
5aaaf08723 removed dead code 2016-02-02 21:24:43 -05:00
Luke Pulverenti
90eb88f883 update components 2016-02-02 21:12:02 -05:00
Luke Pulverenti
5e3ab690af update components 2016-02-02 15:36:33 -05:00
Luke Pulverenti
2371272bd2 update subtitle focus 2016-02-02 13:41:18 -05:00
Luke Pulverenti
ca38398601 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
2016-02-01 22:21:58 -05:00
Luke Pulverenti
5b1b16eab9 add play buttons to latest items 2016-02-01 21:41:14 -05:00
Luke Pulverenti
05714ad3fb update translations 2016-02-01 21:40:48 -05:00
Luke Pulverenti
f6960f3838 update ffmpeg 2016-02-01 16:01:20 -05:00
Luke Pulverenti
b4d17e1a5f fix quality options 2016-02-01 15:43:56 -05:00
Luke Pulverenti
bb0287c5f7 fix quality options 2016-02-01 15:41:56 -05:00
Luke Pulverenti
dcb85ffe74 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
73e7c0af7a fix changestream 2016-02-01 14:12:56 -05:00
Luke Pulverenti
e229f98967 fix resume after changeStream 2016-02-01 14:12:46 -05:00
Luke Pulverenti
67f551d952 update action sheet 2016-02-01 14:12:35 -05:00
Luke Pulverenti
1508803d6e update components 2016-02-01 14:12:22 -05:00
Luke Pulverenti
e1420ddb93 update components 2016-02-01 14:12:12 -05:00
Luke Pulverenti
b2d9967968 fix changestream 2016-02-01 14:10:44 -05:00
Luke Pulverenti
8c10f27035 fix resume after changeStream 2016-02-01 14:07:16 -05:00
Luke Pulverenti
9cb9e04ff7 update action sheet 2016-02-01 13:43:55 -05:00
Luke Pulverenti
6081027461 update components 2016-02-01 13:39:23 -05:00
Luke Pulverenti
555b1ddedc update components 2016-02-01 12:52:23 -05:00
Luke Pulverenti
3e156cda5b update video player action sheets 2016-02-01 12:23:44 -05:00
Luke Pulverenti
2eb6f86119 update components 2016-02-01 12:23:35 -05:00
Luke Pulverenti
4196c06485 update video player action sheets 2016-02-01 12:02:46 -05:00
Luke Pulverenti
048ba20590 update components 2016-02-01 12:02:17 -05:00
Luke Pulverenti
29af47046c update locking 2016-01-31 20:00:04 -05:00
Luke Pulverenti
619d81ee23 use shared slideshow 2016-01-31 19:59:54 -05:00
Luke Pulverenti
ce8bc1a2f6 update action sheet 2016-01-31 19:59:43 -05:00
Luke Pulverenti
745df0d74b update components 2016-01-31 19:59:34 -05:00
Luke Pulverenti
07ea3b3751 update components
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
2016-01-31 19:59:12 -05:00
Luke Pulverenti
2a72f0256e update locking 2016-01-31 19:57:40 -05:00
Luke Pulverenti
3eec24c917 use shared slideshow 2016-01-31 01:03:40 -05:00
Luke Pulverenti
c959aa01a2 update action sheet 2016-01-30 23:04:00 -05:00