From 3205913b2a8559a6a29a81d63dd144249db6e234 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 13 Jun 2015 19:56:59 -0400 Subject: support in-app connect signup --- .../Localization/JavaScript/javascript.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json') diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index 954ed5f96..48d3296e5 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -804,5 +804,9 @@ "ButtonManageServer": "Manage Server", "ButtonPreferences": "Preferences", "ButtonViewArtist": "View artist", - "ButtonViewAlbum": "View album" + "ButtonViewAlbum": "View album", + "ErrorMessagePasswordNotMatchConfirm": "The password and password confirmation must match.", + "ErrorMessageUsernameInUse": "The username is already in use. Please choose a new name and try again.", + "ErrorMessageEmailInUse": "The email address is already in use. Please enter a new email address and try again, or use the forgot password feature.", + "MessageThankYouForConnectSignUp": "Thank you for signing up for Emby Connect. An email will be sent to your address with instructions on how to confirm your new account. Please confirm the account and then return here to sign in." } -- cgit v1.2.3 From a98ec27365433b5e099cd312c0bbc789321aa9cf Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 19 Jun 2015 12:36:51 -0400 Subject: switch polymer to bower --- .../Localization/JavaScript/javascript.json | 1 + .../Localization/Server/server.json | 1 - MediaBrowser.WebDashboard/Api/PackageCreator.cs | 19 +- .../MediaBrowser.WebDashboard.csproj | 543 +++++++++++++++++---- 4 files changed, 462 insertions(+), 102 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json') diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index 48d3296e5..7278721cc 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -39,6 +39,7 @@ "TextEnjoyBonusFeatures": "Enjoy Bonus Features", "TitleLiveTV": "Live TV", "TitleSync": "Sync", + "HeaderSelectDate": "Select Date", "ButtonDonate": "Donate", "LabelRecurringDonationCanBeCancelledHelp": "Recurring donations can be cancelled at any time from within your PayPal account.", "HeaderMyMedia": "My Media", diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index e1bc8161d..444c186aa 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -1427,7 +1427,6 @@ "OptionEnableFullSpeedConversion": "Enable full speed conversion", "OptionEnableFullSpeedConversionHelp": "By default, sync conversion is performed at a low speed to minimize resource consumption.", "HeaderPlaylists": "Playlists", - "HeaderSelectDate": "Select Date", "HeaderViewStyles": "View Styles", "LabelSelectViewStyles": "Enable enhanced presentations for:", "LabelSelectViewStylesHelp": "If enabled, views will be built with metadata to offer categories such as Suggestions, Latest, Genres, and more. If disabled, they'll be displayed with simple folders.", diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index 11042314e..033ffd5f3 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -276,13 +276,16 @@ namespace MediaBrowser.WebDashboard.Api var imports = new string[] { - //"thirdparty/polymer/polymer.html", - "thirdparty/paper-button/paper-button.html", - "thirdparty/paper-toast/paper-toast.html", - "thirdparty/paper-spinner/paper-spinner.html", - "thirdparty/paper-fab/paper-fab.html", - //"thirdparty/paper-icon-button/paper-icon-button.html", - "thirdparty/iron-icons/emby-icons.html" + "bower_components/paper-button/paper-button.html", + "bower_components/paper-toast/paper-toast.html", + "bower_components/paper-spinner/paper-spinner.html", + "bower_components/paper-fab/paper-fab.html", + "bower_components/paper-dialog/paper-dialog.html", + "bower_components/paper-dialog-scrollable/paper-dialog-scrollable.html", + "bower_components/neon-animation/animations/scale-up-animation.html", + "bower_components/neon-animation/animations/fade-out-animation.html", + //"bower_components/paper-icon-button/paper-icon-button.html", + "thirdparty/emby-icons.html" }; var importsHtml = string.Join("", imports.Select(i => "").ToArray()); @@ -408,7 +411,7 @@ namespace MediaBrowser.WebDashboard.Api var files = new List { - "thirdparty/webcomponentsjs/webcomponents-lite.min.js", + "bower_components/webcomponentsjs/webcomponents-lite.min.js", "scripts/all.js" + versionString }; diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 52d245967..0c7504d98 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -87,253 +87,529 @@ - + + + + + + PreserveNewest + + + + + + + + + PreserveNewest + + + + + + + + + PreserveNewest + + + PreserveNewest + + + + + + + + + + + + PreserveNewest + + + + + + + + + + PreserveNewest - + + + + + PreserveNewest - + + + + + + + + + + + + + + + + + + + + + + PreserveNewest - + + + + + + + PreserveNewest - + + + + + + + + PreserveNewest - + PreserveNewest - + PreserveNewest - - Always + + + + + + + + + PreserveNewest - + + + + + + + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + + + + + + + + + + + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + + + + + + + PreserveNewest - + PreserveNewest - + + + + + + + + + PreserveNewest - + + + + + + + + + + + + + + + + + PreserveNewest - + + + + + + + + + + + + + PreserveNewest - + + + + + + + PreserveNewest - + + + + + + + PreserveNewest - + + + + + + + PreserveNewest - + PreserveNewest - + + + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + + + + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + + + + + PreserveNewest - + + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + + PreserveNewest - + + + + PreserveNewest - + + PreserveNewest - + + PreserveNewest - + + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + + Always + + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + PreserveNewest @@ -2407,6 +2683,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest @@ -2521,15 +2887,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - -- cgit v1.2.3 From 2341ce09833441a096c339acd9e6df84f57c2f98 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 19 Jun 2015 18:01:47 -0400 Subject: update icons --- .../Localization/JavaScript/javascript.json | 1 + MediaBrowser.WebDashboard/Api/PackageCreator.cs | 1 + MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 3 +++ 3 files changed, 5 insertions(+) (limited to 'MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json') diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index 7278721cc..8b8d7d30c 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -796,6 +796,7 @@ "HeaderMedia": "Media", "ButtonInbox": "Inbox", "HeaderAdvanced": "Advanced", + "HeaderGroupVersions": "Group Versions", "HeaderSaySomethingLike": "Say Something Like...", "ButtonTryAgain": "Try Again", "HeaderYouSaid": "You Said...", diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index e6f2b0e1b..44e5d7cbd 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -284,6 +284,7 @@ namespace MediaBrowser.WebDashboard.Api "bower_components/paper-dialog-scrollable/paper-dialog-scrollable.html", "bower_components/neon-animation/animations/scale-up-animation.html", "bower_components/neon-animation/animations/fade-out-animation.html", + "bower_components/neon-animation/animations/fade-in-animation.html", "bower_components/paper-icon-button/paper-icon-button.html", "thirdparty/emby-icons.html" }; diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 5b6f43736..fff0032cc 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -582,6 +582,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest -- cgit v1.2.3 From 72752fc5596e37c32c47de9bfb4cd0c0f22976c5 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 22 Jun 2015 11:43:19 -0400 Subject: update menus --- .../Localization/JavaScript/javascript.json | 1 + .../MediaBrowser.ServerApplication.csproj | 1 - MediaBrowser.WebDashboard/Api/PackageCreator.cs | 3 +- .../MediaBrowser.WebDashboard.csproj | 43 ++++++++++++++-------- 4 files changed, 30 insertions(+), 18 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json') diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index 8b8d7d30c..8bc244891 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -38,6 +38,7 @@ "HeaderSupportTheTeam": "Support the Emby Team", "TextEnjoyBonusFeatures": "Enjoy Bonus Features", "TitleLiveTV": "Live TV", + "ButtonCancelSyncJob": "Cancel sync job", "TitleSync": "Sync", "HeaderSelectDate": "Select Date", "ButtonDonate": "Donate", diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 9b20ac717..c0830c8c9 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -99,7 +99,6 @@ Component - Form diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index 06fbd1a7d..fd353962a 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -262,7 +262,7 @@ namespace MediaBrowser.WebDashboard.Api html = html.Replace("", "") .Replace("", "
") - .Replace("", "
"); + .Replace("", "
"); } if (enableMinification) @@ -666,7 +666,6 @@ namespace MediaBrowser.WebDashboard.Api "pluginupdates.css", "remotecontrol.css", "userimage.css", - "livetv.css", "nowplaying.css", "materialize.css" }; diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 39481e9a4..074628a8d 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -178,6 +178,18 @@ + + + + + + + + + + + + @@ -421,6 +433,13 @@ + + + + + + + @@ -541,6 +560,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -634,18 +656,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -2750,6 +2760,9 @@ + + + @@ -2793,6 +2806,9 @@ + + + @@ -2933,9 +2949,6 @@ PreserveNewest - - PreserveNewest -
-- cgit v1.2.3