Skip to content

Commit 855f604

Browse files
committed
v3.4.9
1 parent 8e2276a commit 855f604

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+5306
-4593
lines changed

.gitlab/issue_templates/release.md

+25-12
Original file line numberDiff line numberDiff line change
@@ -57,28 +57,37 @@ repo: https://github.com/Windscribe/browser-extension
5757
Note: Keep the Dev Console open in the background and watch for any console errors. Any and all Console errors must be reported as bugs.
5858

5959
## 1. Update checks
60+
6061
Update from the previous version and verify that:
62+
6163
- [ ] General settings are retained.
6264
- [ ] Blocker settings are retained.
6365
- [ ] Privacy settings are retained.
64-
- [ ] Whitelist is retained.
65-
66-
66+
- [ ] Allowlist is retained.
67+
68+
69+
6770
## 2. Full Browser Shutdown & Restart
71+
6872
- [ ] General settings are retained.
6973
- [ ] Blocker settings are retained.
7074
- [ ] Privacy settings are retained.
71-
- [ ] Whitelist is retained.
72-
75+
- [ ] Allowlist is retained.
76+
77+
7378
## 3. Server List Updates
79+
7480
Server List should update when:
81+
7582
- [ ] Account status changes.
7683
- [ ] loc_hash changes.
7784
- [ ] Pro status changes.
7885
- [ ] ALC changes.
7986
- [ ] If new list does not contain current connect location, move up the location tree and fallback to Auto-Pilot.
80-
87+
88+
8189
## 4. Feature / Functionality Checks
90+
8291
- ### General:
8392
- [ ] Auto-connect works.
8493
- [ ] Notifications work.
@@ -105,12 +114,14 @@ Server List should update when:
105114
- ### Account:
106115
- [ ] Edit Account works.
107116
- [ ] E-mail linking to account works.
108-
- ### Whitelist:
109-
- [ ] Adding to Whitelist works.
110-
- [ ] Editing element in Whitelist works.
111-
- [ ] Removing from Whitelist works.
112-
117+
- ### Allowlist:
118+
- [ ] Adding to Allowlist works.
119+
- [ ] Editing element in Allowlist works.
120+
- [ ] Removing from Allowlist works.
121+
122+
113123
## 5. UX Tests:
124+
114125
- [ ] "Sign up" redirects to relevant locations on the website.
115126
- [ ] "Forgot Password" works.
116127
- [ ] Alphabetical / Geographical Location toggle works.
@@ -128,8 +139,10 @@ Server List should update when:
128139
- - [ ] Removing locations from favorites works.
129140
- - [ ] Favorites are saved between restarts.
130141
- - [ ] Connecting to favorite location works (and IP changes).
131-
142+
143+
132144
## 6. Other Tests:
145+
133146
- [ ] General UI glitches
134147
- - [ ] View persistence.
135148
- - [ ] Fonts.

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Source code of the Windscribe Chrome and Firefox browser extensions. This extens
1717

1818
```
1919
yarn cache clean && yarn install
20+
cd modules/ext && cp .env.schema .env
2021
yarn workspace ws-api-client build
2122
yarn workspace ext build
2223
```

modules/ext.code-workspace

+40-41
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,44 @@
11
{
22
"folders": [
3-
{
4-
"path": "ext"
5-
},
6-
{
7-
"path": "ui"
8-
},
9-
{
10-
"path": "ws-api-client"
11-
}
12-
],
13-
"settings": {
14-
"files.exclude": {
15-
"**/.git": true,
16-
"**/.svn": true,
17-
"**/.hg": true,
18-
"**/CVS": true,
19-
"**/.DS_Store": true,
20-
"**/*.hot-update.json": true,
21-
"**/*.hot-update.js": true
22-
},
23-
"path-autocomplete.pathMappings": {
24-
"$root": "${workspace}/src"
25-
},
26-
"cSpell.words": [
27-
"Onboarding",
28-
"all",
29-
"include",
30-
"subdomains",
31-
"whitelisted"
3+
{
4+
"path": "ext"
5+
},
6+
{
7+
"path": "ui"
8+
},
9+
{
10+
"path": "ws-api-client"
11+
}
3212
],
33-
"javascript.validate.enable": false,
34-
"typescript.surveys.enabled": false
35-
36-
},
37-
"extensions": {
38-
"recommendations": [
39-
"ionutvmi.path-autocomplete",
40-
"EditorConfig.EditorConfig",
41-
"esbenp.prettier-vscode",
42-
"jpoissonnier.vscode-styled-components"
43-
]
44-
}
13+
"settings": {
14+
"files.exclude": {
15+
"**/.git": true,
16+
"**/.svn": true,
17+
"**/.hg": true,
18+
"**/CVS": true,
19+
"**/.DS_Store": true,
20+
"**/*.hot-update.json": true,
21+
"**/*.hot-update.js": true
22+
},
23+
"path-autocomplete.pathMappings": {
24+
"$root": "${workspace}/src"
25+
},
26+
"cSpell.words": [
27+
"Onboarding",
28+
"all",
29+
"include",
30+
"subdomains",
31+
"allowlisted"
32+
],
33+
"javascript.validate.enable": false,
34+
"typescript.surveys.enabled": false
35+
},
36+
"extensions": {
37+
"recommendations": [
38+
"ionutvmi.path-autocomplete",
39+
"EditorConfig.EditorConfig",
40+
"esbenp.prettier-vscode",
41+
"jpoissonnier.vscode-styled-components"
42+
]
43+
}
4544
}

modules/ext/automated_tests/chrome.tests.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const fs = require('fs-extra')
55
const rimraf = require('rimraf')
66
const path = require('path')
77
const argv = require('yargs')
8-
.alias('W', 'whitelist')
8+
.alias('W', 'allowlist')
99
.array('W')
1010
.boolean('keepOpen')
1111
.boolean('autoConnect')
@@ -101,9 +101,9 @@ describe('chrome extension', () => {
101101
await setupBrowser({ showPopup: argv.e2e || argv.ghost })
102102
})
103103

104-
const logicTests = argv.logic ? getLogicTests(argv.whitelist) : []
105-
const e2eTests = argv.e2e ? getE2eTests(argv.whitelist) : []
106-
const ghostTests = argv.ghost ? getGhostTests(argv.whitelist) : []
104+
const logicTests = argv.logic ? getLogicTests(argv.allowlist) : []
105+
const e2eTests = argv.e2e ? getE2eTests(argv.allowlist) : []
106+
const ghostTests = argv.ghost ? getGhostTests(argv.allowlist) : []
107107
const allTests = [...e2eTests, ...logicTests, ...ghostTests]
108108

109109
for (let t of allTests) {

modules/ext/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ext",
3-
"version": "3.4.8",
3+
"version": "3.4.9",
44
"private": true,
55
"dependencies": {
66
"@babel/plugin-proposal-export-default-from": "~7.8.3",
@@ -53,7 +53,7 @@
5353
"react": "^16.8.0",
5454
"react-axe": "^3.3.0",
5555
"react-custom-scrollbars": "4.2.1",
56-
"react-devtools": "^4.8.2",
56+
"react-devtools": "^4.24.7",
5757
"react-dom": "^16.8.0",
5858
"react-i18next": "^10.4.1",
5959
"react-joyride": "^2.1.1",
@@ -134,7 +134,7 @@
134134
"web-ext": "~4.0.0",
135135
"webpack-dev-server": "^3.11.0"
136136
},
137-
"uBlockVersion": "ws-v1.44.4",
137+
"uBlockVersion": "ws-1.51.0",
138138
"main": "index.js",
139139
"license": "MIT"
140140
}

modules/ext/public/content-scripts/language-switch.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function navigatorLanguages(localeCode) {
2828

2929
const switchLocale = localeCode =>
3030
injectScript(`
31-
if (typeof wsWhitelisted === 'undefined') {
31+
if (typeof wsAllowlisted === 'undefined') {
3232
${intlLocale.toString()}
3333
intlLocale('${localeCode.toString()}');
3434
${navigatorLanguage.toString()}

modules/ext/public/content-scripts/proxy-time.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ const injectScript = content => {
262262

263263
const shiftTime = timeWarp =>
264264
injectScript(`
265-
if (typeof wsWhitelisted === 'undefined') {
265+
if (typeof wsAllowlisted === 'undefined') {
266266
if (!window.ODate) {
267267
window.ODate = Date
268268
}

modules/ext/public/content-scripts/worker-block.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-undef */
22
const blockWorker = () =>
33
injectScript(`
4-
if (typeof wsWhitelisted === 'undefined') {
4+
if (typeof wsAllowlisted === 'undefined') {
55
window.manageWebWorkers = new (function() {
66
let oldWorker = window.Worker
77
let newWorker = function() {

modules/ext/public/manifest/base.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifest_version": 2,
33
"name": "Windscribe - Free Proxy and Ad Blocker",
44
"short_name": "Windscribe",
5-
"version": "3.4.8",
5+
"version": "3.4.9",
66
"description": "Windscribe helps you mask your physical location, circumvent censorship, and block ads and trackers on websites you use every day",
77
"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self';",
88
"default_locale": "en",
File renamed without changes.

modules/ext/src/assets/whitelist_checkmark_icon.svg modules/ext/src/assets/allowlist_checkmark_icon.svg

+2-2
Loading

modules/ext/src/assets/whitelist_icon.svg modules/ext/src/assets/allowlist_icon.svg

+2-2
Loading

modules/ext/src/assets/globe.svg

+1-1
Loading

modules/ext/src/assets/globe_arrow.svg

+1-1
Loading

modules/ext/src/assets/interfaces/android-icon.svg

+1-1
Loading

modules/ext/src/assets/interfaces/chromeOS-icon.svg

+1-1
Loading

0 commit comments

Comments
 (0)