anticensority/runet-censorship-bypass
1
1
Fork 0
mirror of https://github.com/anticensority/runet-censorship-bypass.git synced 2024-11-24 02:13:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into production

Browse Source
This commit is contained in:
Ilya Ig. Petrov 2018-05-15 20:49:23 +05:00
commit 77ac9ec63d
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js
View File

@ -120,8 +120,8 @@
\` \`
Не найдено СВОИХ прокси. Этот PAC-скрипт Не найдено СВОИХ прокси. Этот PAC-скрипт
<a href="https://github.com/anticensority/runet-censorship-bypass/issues/10#issuecomment-387436191">теперь</a> <a href="https://github.com/anticensority/runet-censorship-bypass/issues/10#issuecomment-387436191">теперь</a>
работает только со <a href="https://rebrand.ly/ac-own-proxy">СВОИМИ прокси</a> работает только со <a href="https://git.io/ac-own-proxy">СВОИМИ прокси</a>
(по умолчанию используется локальный <a href="https://rebrand.ly/ac-tor">TOR</a> и прокси "Антизапрет", для их отключения: Свои прокси -> откл. "Использовать прокси PAC-скрипта"). (по умолчанию используется локальный <a href="https://git.io/ac-tor">TOR</a> и прокси "Антизапрет", для их отключения: Свои прокси -> откл. "Использовать прокси PAC-скрипта").
\`, \`,
); );
} }
@ -573,12 +573,12 @@
} }
} }
if (window.apis.version.isLeq(oldStorage.version, '0.0.1.23')) { if (window.apis.version.isLeq(oldStorage.version, '0.0.1.25')) {
console.log('Switch to Antizapret automatically, only from Anitcensority without own proxies.'); console.log('Switch to Antizapret automatically, only from Anitcensority without own proxies.');
const provKey = antiCensorRu.getCurrentPacProviderKey(); const provKey = antiCensorRu.getCurrentPacProviderKey();
if (provKey !== 'Антицензорити') { if (provKey !== 'Антицензорити' && provKey !== 'Антизапрет') {
console.log('Current provider', provKey, '!== Anticensority'); console.log('Current provider', provKey, '!== Anticensority or Antizapret');
return; // Not Anticensority. return; // Not Anticensority.
} }
const pacMods = window.apis.pacKitchen.getPacMods(); const pacMods = window.apis.pacKitchen.getPacMods();
@ -587,6 +587,7 @@
return; // Own proxies or Tor are used. return; // Own proxies or Tor are used.
} }
antiCensorRu.setCurrentPacProviderKey('Антизапрет'); antiCensorRu.setCurrentPacProviderKey('Антизапрет');
antiCensorRu.setLastModified(0);
await new Promise((resolveSwitch) => await new Promise((resolveSwitch) =>
antiCensorRu.syncWithPacProviderAsync((err, res, warns) => { antiCensorRu.syncWithPacProviderAsync((err, res, warns) => {
@ -596,11 +597,11 @@
} }
if (err) { if (err) {
console.log( console.log(
'Ungraceful update from 1.23: couldn\\'t fetch Antizapret:', 'Ungraceful update from 1.25: couldn\\'t fetch Antizapret:',
); );
console.error(err); console.error(err);
} else { } else {
console.log('Update from 1.23 applied successfully.'); console.log('Update from 1.25 applied successfully.');
} }
resolveSwitch(); resolveSwitch();

2
extensions/chromium/runet-censorship-bypass/src/extension-common/70-menu-items.js
View File

@ -39,7 +39,7 @@
support: { support: {
title: 'Документация / Помощь / Поддержка', title: 'Документация / Помощь / Поддержка',
getUrl: (blockedUrl) => 'https://rebrand.ly/ac-wiki', getUrl: (blockedUrl) => 'https://git.io/ac-wiki',
order: 99, order: 99,
}, },

2
extensions/chromium/runet-censorship-bypass/src/extension-common/_locales/en/messages.tmpl.json
View File

@ -3,7 +3,7 @@
"message": "Runet Censorship Bypass${nameSuffixEn}" "message": "Runet Censorship Bypass${nameSuffixEn}"
}, },
"extDesc": { "extDesc": {
"message": "Circumvent Russian Internet Censorship: https://rebrand.ly/ac-wiki" "message": "Circumvent Russian Internet Censorship: https://git.io/ac-wiki"
}, },
"proxy": { "proxy": {
"message": "proxy" "message": "proxy"

2
extensions/chromium/runet-censorship-bypass/src/extension-common/_locales/ru/messages.tmpl.json
View File

@ -3,7 +3,7 @@
"message": "Обход блокировок Рунета${nameSuffixRu}" "message": "Обход блокировок Рунета${nameSuffixRu}"
}, },
"extDesc": { "extDesc": {
"message": "Обход интернет-цензуры в России: https://rebrand.ly/ac-wiki" "message": "Обход интернет-цензуры в России: https://git.io/ac-wiki"
}, },
"proxy": { "proxy": {
"message": "прокси" "message": "прокси"

4
extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/App.js
View File

@ -83,8 +83,8 @@ export default function getApp(theState) {
}; };
// I comment and uncomment this variable manually before release or build: // I comment and uncomment this variable manually before release or build:
// const ghUrl = `https://api.github.com/repos/anticensority/chromium-extension/issues/10/comments${query}`; const ghUrl = `https://api.github.com/repos/anticensority/chromium-extension/issues/10/comments${query}`;
const ghUrl = `https://api.github.com/repos/anticensority/for-testing/issues/1/comments${query}`; // const ghUrl = `https://api.github.com/repos/anticensority/for-testing/issues/1/comments${query}`;
const [error, comments, etag] = await fetch( const [error, comments, etag] = await fetch(
ghUrl, ghUrl,

2
extensions/chromium/runet-censorship-bypass/src/templates-data.js
View File

@ -10,7 +10,7 @@ const pacUrls = [
]; ];
const commonContext = { const commonContext = {
version: '1.24', version: '1.27',
anticensorityPacUrls: [ anticensorityPacUrls: [
...pacUrls, ...pacUrls,
], ],