Merge branch 'build/1.x' into development

This commit is contained in:
Ilya Ig. Petrov 2017-06-12 22:17:43 +05:00
commit bce8606658
3 changed files with 3 additions and 1 deletions

View File

@ -21,6 +21,7 @@
, "notifications" , "notifications"
${extra_permissions} ${extra_permissions}
], ],
"minimum_chrome_version": "55.0.0.0",
"background": { "background": {
${persistent} ${persistent}

View File

@ -505,6 +505,7 @@ PROXY foobar.com:8080; # Not HTTP!`.trim()}
return proxyStringRaw return proxyStringRaw
.replace(/#.*$/mg, '') // Strip comments. .replace(/#.*$/mg, '') // Strip comments.
.replace(/\s*DIRECT\s*/g, '') // Remove DIRECT from old versions.
.split( /(?:[^\S\r\n]*(?:;|\r?\n)+[^\S\r\n]*)+/g ) .split( /(?:[^\S\r\n]*(?:;|\r?\n)+[^\S\r\n]*)+/g )
.map( (p) => p.trim() ) .map( (p) => p.trim() )
.filter((p) => p) .filter((p) => p)

View File

@ -1,7 +1,7 @@
'use strict'; 'use strict';
const commonContext = { const commonContext = {
version: '1.0', version: '1.1',
}; };
exports.contexts = {}; exports.contexts = {};