Merge remote-tracking branch 'refs/remotes/origin/master' into legacypermissions

Author: andryou

html/options.html

@@ -75,7 +75,7 @@ <h4 id="sectionname">General Settings</h4>
 								<tr><td class="col-sm-4"><label for="syncnotify">Show Sync Notification:</label></td><td><input type="checkbox" id="syncnotify" class="save" /> <i>(Default: enabled; show popup when settings synced <strong>to</strong> your Google Account)</i></td></tr>
 								<tr><td class="col-sm-4"><label for="syncfromnotify">Show Import Sync Notification:</label></td><td><input type="checkbox" id="syncfromnotify" class="save" /> <i>(Default: enabled; show popup when settings synced <strong>from</strong> your Google Account)</i></td></tr>
 								<tr><td class="col-sm-4"><label for="updatenotify">Show Changelog on Update:</label></td><td><input type="checkbox" id="updatenotify" class="save" /> <i>(Default: enabled; show changelog page when ScriptSafe is updated)</i></td></tr>
-								<tr><td class="col-sm-4"><label>Hotkeys:</label></td><td> <a href="javascript:;" id="hotkeyspage" class="btn btn-primary">Configure ScriptSafe hotkeys</a> (click on "Keyboard Shortcuts")</td></tr>
+								<tr><td class="col-sm-4"><label>Hotkeys:</label></td><td><p><strong>Available hotkey actions</strong>:<ul><li>Temporarily allow/block all resources for a current tab</li><li>Remove temporary permissions for a current tab</li><li>Remove all temporary permissions</li></ul><p><a href="javascript:;" id="hotkeyspage" class="btn btn-primary">Configure ScriptSafe hotkeys</a> (click on "Keyboard Shortcuts")</p></td></tr>
 							</table>
 						</div>
 						<div id="fingerprintprotection" class="tab">

html/updated.html

@@ -32,14 +32,14 @@
 			<div class="panel panel-success">
 				<div class="panel-heading"><h3>Updated to v<span id="versionno"></span>! (Thursday, June 30, 2016)</h3></div>
 				<div class="panel-body">
-					<p>I spent the last two weeks focusing on bringing <strong>Fingerprinting Protection</strong> to ScriptSafe. The Options page now has a new Fingerprinting Protection section with not one, not two, not three, but <strong>nine brand-new options</strong>!</p>
+					<p>I spent the last two weeks focusing on bringing <strong>Fingerprinting Protection</strong> to ScriptSafe. If you haven't noticed, the Options page now has a new Fingerprinting Protection section with not one, not two, not three, but <strong>nine brand-new options</strong>!</p>
 					<p>In addition, two new options have been added to remove URL-based tracking, as well as an option to spoof your browser's timezone (handy for VPN users).</p>
 					<p>As you have probably noticed already, the look of this page has changed! <strong>But wait, there's more! <a href="options.html" target="_blank">Check out the Options page</a></strong> :)</p>
 					<p>Still on my list: 1) translate ScriptSafe into multiple languages; and 2) improve design and appearance.</p>
 					<p>Much love to all who helped report issues and tested the beta versions of this release, as well as to everyone for inspiring me and sharing ideas on how to make ScriptSafe better for everyone.</p>
 					<p>In this release you will find the following updates:</p>
 					<ul>
-						<li><strong>v1.0.7.16:</strong><ul>
+						<li><strong>v1.0.8.0:</strong><ul>
 							<li>Revamped the design of this page and the Options page: wider layout, larger/more readable words, and intuitive buttons. On the new Options page you are able to toggle between Grouped and List views by clicking on the button in the top-right corner.</li>
 							<li>Added a new <strong>Fingerprinting Protection</strong> section with the following options <i>(all disabled by default)</i>:<ul>
 								<li><strong>Canvas Fingerprint Protection</strong> - protect against fingerprinting attempts through &lt;canvas&gt; elements, with the following options:<ul>
@@ -64,11 +64,11 @@
 							<li>Added <strong>Prevent Clipboard Interference</strong> option (under <strong>Behavior Settings</strong>) - prevent pages from interfering with clipboard actions <i>(disabled by default)</i></li>
 							<li>Added option to apply user-agent spoofing on whitelisted domains as well (default behaviour is to disable spoofing on whitelisted domains to avoid issues, but enabling this option will spoof the user-agent regardless)</li>
 							<li>Added <strong>Save as Text File</strong> functionality to the Export Settings portion in the Options page</li>
-							<li>Fix Panel expand issue for Mac OS X users</a></li>
+							<li>Fix Panel expand issue for Mac OS X users</li>
 							<li>Updated unwanted content providers list</li>
 							<li>Created a beta testing signup form. If you sign up to become a beta tester, you will be emailed when there is a new version ready to be tested before being pushed to the Chrome Web Store. <a href="https://docs.google.com/forms/d/1MXUSlQHP_XbXbbKYrxaW_8eIY4Y3SyiyUg1yhoBUoQM/viewform" target="_blank">Sign up to be a beta tester!</a></li>
 							<li>I now have a Bitcoin address due to inquiries from people wary of PayPal but wanted to still donate!<ul>
-								<li><a href="bitcoin:39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92"><strong>39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92</strong></a><br />(also found at the bottom of this page and the Options page)</li>
+								<li><a href="bitcoin:39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92"><strong>39VJ5L9Yd6WocG6r88uE7ZZnM5J2M5bW92</strong></a><br />(also found at the top of this and the Options page)</li>
 							</ul></li>
 						</ul></li>
 					</ul>

js/yoyo.js

@@ -1262,6 +1262,7 @@ var yoyo1 = [
 'allyes.com',
 'almondnetworks.com',
 'alphagirlz.mobi',
+'alphamedical02.fr',
 'alsoknowsit.com',
 'altmedia101.com',
 'alwayson-network.com',
@@ -7880,6 +7881,7 @@ var yoyo1 = [
 'website-designs.com',
 'website-hit-counters.com',
 'websitealive3.com',
+'websitebuildersinfo.in',
 'websitefinancing.com',
 'websitehome.co.uk',
 'websitepromoserver.com',

manifest.json

@@ -47,5 +47,5 @@
    "options_page": "html/options.html",
    "permissions": [ "http://*/*", "https://*/*", "tabs", "unlimitedStorage", "webRequest", "webRequestBlocking", "storage", "notifications" ],
    "update_url": "http://clients2.google.com/service/update2/crx",
-   "version": "1.0.7.16"
+   "version": "1.0.8.0"
 }