Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/Develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Gerardufoin committed Sep 6, 2018
2 parents daa098d + ab3a826 commit cadaabb
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Scripts/Class/Manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var Management = {

// Add the name and url to the manager for genericity
$(manager).attr("data-name", name);
$(manager).attr("data-url", url);
$(manager).attr("data-url", decodeURIComponent(url));

// Add bookmark management
this._Bookmark(manager);
Expand Down
11 changes: 0 additions & 11 deletions Scripts/FreeKiss/Events.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,3 @@ chrome.webRequest.onHeadersReceived.addListener(
},
['blocking', 'responseHeaders']
);

/** Block the access to harmful providers of onclick ads popups. */
chrome.webRequest.onBeforeRequest.addListener(
() => {
return {cancel: true};
},
{
urls: ["*://deloton.com/*", "*://cobalten.com/*", "*://3phzb1pbij.com/*"]
},
["blocking"]
);
7 changes: 7 additions & 0 deletions Views/Patchnotes.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@
<div id="content">
<h1>Versions</h1>
<hr>
<div class="patch">
<h2><a href="https://github.com/Gerardufoin/FreeKiss/releases/tag/v1.2.5">1.2.5</a></h2>
<ul>
<li>Revert FreeKiss' permissions to only affect kissmanga.com as the new way to deal with onclick ads make blocking websites obsolete.</li>
<li>Fix FreeKiss being unable to display the bookmarks manager on mangas with encoded urls.</li>
</ul>
</div>
<div class="patch">
<h2><a href="https://github.com/Gerardufoin/FreeKiss/releases/tag/v1.2.4">1.2.4</a></h2>
<ul>
Expand Down
4 changes: 2 additions & 2 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "FreeKiss",
"short_name": "FreeKiss",
"description": "Enhance your KissManga experience.",
"version": "1.2.4",
"version": "1.2.5",

"icons": {
"16": "Images/Icons/icon16.png",
Expand Down Expand Up @@ -69,7 +69,7 @@
],

"permissions": [
"*://*/*",
"*://kissmanga.com/*",
"tabs",
"activeTab",
"storage",
Expand Down

0 comments on commit cadaabb

Please sign in to comment.