diff --git a/CHANGELOG.md b/CHANGELOG.md
index 776dc30..7367a5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,10 @@
Changelog
=====
-## v1.1.0.6 (XX-XX-2015)
+## v1.1.1.0 (04-15-2015)
* Reverted to old video uploads method due to quota exhaustion
* Added four additional API keys
* Implemented search functionality
+ * Added subscription importing
## v1.1.0.5 (02-02-2015)
* Changed channel updater to use the search API instead of the channel's playlist API (This allows more up-to-date updating)
diff --git a/README.md b/README.md
index 2ec2ae1..debe527 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ This code is licensed under the MIT License.
### Permissions
- notifications
- unlimitedStorage
+ - identity (For subscription importing)
- \*://\*.youtube.com/\*
- \*://\*.ytimg.com/\*
@@ -21,7 +22,7 @@ This code is licensed under the MIT License.
[![ChromeWebStore](https://raw.githubusercontent.com/Wassup789/Youtube-Notifications/master/img/chromewebstore.png)](https://chrome.google.com/webstore/detail/youtube-notifications/cilgbgkmanbbecbjihnbpeaoodmgchom)
-**Latest Version:** ***v1.1.0.5***
+**Latest Version:** ***v1.1.1.0***
**Release Archive:**
@@ -32,19 +33,19 @@ This code is licensed under the MIT License.
## Screenshots
**Options - Channel List**
-[![Screenshot 1](http://i.imgur.com/DMqcsFg.png)](http://i.imgur.com/DMqcsFg.png)
+[![Screenshot 1](http://i.imgur.com/fOSP26C.png)](http://i.imgur.com/fOSP26C.png)
**Options - Settings**
-[![Screenshot 2](http://i.imgur.com/CIXlMxn.png)](http://i.imgur.com/CIXlMxn.png)
+[![Screenshot 2](http://i.imgur.com/22c7cwQ.png)](http://i.imgur.com/22c7cwQ.png)
**Options - Channel Information**
-[![Screenshot 3](http://i.imgur.com/xiHQo9Y.png)](http://i.imgur.com/xiHQo9Y.png)
+[![Screenshot 3](http://i.imgur.com/H8KbSTG.png)](http://i.imgur.com/H8KbSTG.png)
**Example Notification**
-[![Screenshot 4](http://i.imgur.com/B3sSnsb.png)](http://i.imgur.com/B3sSnsb.png)
+[![Screenshot 4](http://i.imgur.com/M85fE82.png)](http://i.imgur.com/M85fE82.png)
## Changelog
[See CHANGELOG.md][CLog.md]
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 02bd03c..13ebb40 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -71,6 +71,10 @@
"description": "The label for the change user subscription button",
"message": "Change User"
},
+ "settings_vertSettings_viewChangelog": {
+ "description": "The label for the view changelog button",
+ "message": "View Changelog"
+ },
"settings_vertSettings_help": {
"description": "The label for the help button",
"message": "Help"
diff --git a/_locales/es/messages.json b/_locales/es/messages.json
index 8657c26..07ccf5b 100644
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -71,6 +71,10 @@
"description": "The label for the change user subscription button",
"message": "Cambiar usuario"
},
+ "settings_vertSettings_viewChangelog": {
+ "description": "The label for the view changelog button",
+ "message": "Ver lista de cambios"
+ },
"settings_vertSettings_help": {
"description": "The label for the help button",
"message": "Ayuda"
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index 9e4b3fe..4e291e8 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -71,6 +71,10 @@
"description": "The label for the change user subscription button",
"message": "Changer d'utilisateur"
},
+ "settings_vertSettings_viewChangelog": {
+ "description": "The label for the view changelog button",
+ "message": "Voir le Changelog"
+ },
"settings_vertSettings_help": {
"description": "The label for the help button",
"message": "Aider"
diff --git a/js/background.js b/js/background.js
index 5fcc0c1..b7f27e9 100644
--- a/js/background.js
+++ b/js/background.js
@@ -96,6 +96,7 @@ chrome.runtime.onInstalled.addListener(function(details){
var thisVersion = chrome.runtime.getManifest().version;
if(details.previousVersion != thisVersion){
console.log("Updated from " + details.previousVersion + " to " + thisVersion);
+ chrome.browserAction.setBadgeText({text: "new"});
var settings = JSON.parse(localStorage.getItem("settings"));
settings.updated.enabled = true;
diff --git a/js/settings.js b/js/settings.js
index 0ac7f1b..55138ec 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -30,6 +30,8 @@ var wyns = {};
},
wyns.previousLastListItem;
$(function(){
+ chrome.browserAction.setBadgeText({text: ""});
+
setLocales();
if(!chrome.extension.getBackgroundPage().wyn.isConnected)
@@ -71,8 +73,11 @@ $(function(){
$("#version").html(wyns.strings.info_version + " " + manifest.version + "
" + wyns.strings.info_by + " Wassup789");
var settings = JSON.parse(localStorage.getItem("settings"));
- if(settings.updated.enabled)
- $("#version-updated").show();
+ if(settings.updated.enabled){
+ $("#changelog-dialog .card-header").text("v" + chrome.runtime.getManifest().version);
+ $("#changelog-container").attr("data-toggle", true);
+ }
+ //$("#version-updated").show();
getVideoList();
registerListeners();
@@ -292,20 +297,32 @@ function registerListeners(){
$(this).attr("data-toggle", "true");
}
});
+ $("#menu_viewChangelog").on("click", function(){
+ $("#changelog-dialog .card-header").text("v" + chrome.runtime.getManifest().version);
+ $("#changelog-container").attr("data-toggle", true);
+ });
$("#menu_help").on("click", function(){
chrome.extension.getBackgroundPage().wyn.firstLaunch();
});
$("#version-updated").on("click", function(){
$("#changelog-dialog .card-header").text("v" + chrome.runtime.getManifest().version);
$("#changelog-container").attr("data-toggle", true);
- var settings = JSON.parse(localStorage.getItem("settings"));
- settings.updated.enabled = false;
- localStorage.setItem("settings", JSON.stringify(settings));
+ disableUpdateContainer();
});
$("#changelog-close-button").on("click", function(){
$("#changelog-container").attr("data-toggle", false);
+ disableUpdateContainer();
});
- $("#changelog-container .overlay, #import_channels-container .overlay").on("click", function(){
+ $("#changelog-container .overlay").on("click", function(){
+ $(this).parent().attr("data-toggle", false);
+ disableUpdateContainer();
+ });
+ function disableUpdateContainer(){
+ var settings = JSON.parse(localStorage.getItem("settings"));
+ settings.updated.enabled = false;
+ localStorage.setItem("settings", JSON.stringify(settings));
+ }
+ $("#import_channels-container .overlay").on("click", function(){
if(!$("#loading").is(":visible"))
$(this).parent().attr("data-toggle", false);
});
diff --git a/manifest.json b/manifest.json
index 7a7f8ba..6225f4d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,7 +5,7 @@
},
"name": "__MSG_appName__",
"description": "__MSG_appDesc__",
- "version": "1.1.0.6",
+ "version": "1.1.1.0",
"permissions": [
"notifications",
"unlimitedStorage",
@@ -32,7 +32,7 @@
"128": "img/128.png"
},
"oauth2": {
- "client_id": "836337899077-9v0uf16i106obm32lkhc85ubr90h685u.apps.googleusercontent.com",
+ "client_id": "836337899077-k426d78agmgff3l32a29c4lalg0tb0q1.apps.googleusercontent.com",
"scopes": [
"https://www.googleapis.com/auth/youtube.readonly"
]
diff --git a/settings.html b/settings.html
index 504f3c8..03d7478 100644
--- a/settings.html
+++ b/settings.html
@@ -30,6 +30,7 @@