File tree Expand file tree Collapse file tree 4 files changed +20
-17
lines changed
workbench/browser/actions Expand file tree Collapse file tree 4 files changed +20
-17
lines changed Original file line number Diff line number Diff line change 94
94
"path": "detect_secrets.filters.common.is_baseline_file",
95
95
"filename": "build/secrets/.secrets.baseline"
96
96
},
97
+ {
98
+ "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
99
+ "min_level": 2
100
+ },
97
101
{
98
102
"path": "detect_secrets.filters.heuristic.is_indirect_reference"
99
103
},
930
934
{
931
935
"type": "Hex High Entropy String",
932
936
"filename": "product.json",
933
- "hashed_secret": "293e6cd3b4633dad82e367b11bb7ad31bfe0c669 ",
937
+ "hashed_secret": "82e88fe5fef547ff71ab465da7ff410e61e78610 ",
934
938
"is_verified": false,
935
939
"line_number": 114,
936
940
"is_secret": false
986
990
{
987
991
"type": "Hex High Entropy String",
988
992
"filename": "product.json",
989
- "hashed_secret": "57174a282ac64974893e5f2de95f1bae40679007 ",
993
+ "hashed_secret": "c30044e72c0bb24ce02121d2fcd5c42b271cbfaa ",
990
994
"is_verified": false,
991
995
"line_number": 273,
992
996
"is_secret": false
1416
1420
"is_secret": false
1417
1421
}
1418
1422
],
1419
- "src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts": [
1420
- {
1421
- "type": "IBM Cloud IAM Key",
1422
- "filename": "src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts",
1423
- "hashed_secret": "0d43d6e259826e4ecbda1644424b26de54faa665",
1424
- "is_verified": false,
1425
- "line_number": 96,
1426
- "is_secret": false
1427
- }
1428
- ],
1429
1423
"src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html": [
1430
1424
{
1431
1425
"type": "Base64 High Entropy String",
Original file line number Diff line number Diff line change 9
9
"win32MutexName" : " positron" ,
10
10
"licenseName" : " Software Evaluation License" ,
11
11
"licenseUrl" : " https://github.com/posit-dev/positron/tree/main?tab=License-1-ov-file" ,
12
- "serverLicenseUrl" : " https://github.com/posit-dev/positron/tree/main?tab=License-1-ov-file " ,
12
+ "serverLicenseUrl" : " https://posit.co/about/eula/ " ,
13
13
"serverGreeting" : [],
14
14
"serverLicense" : [],
15
15
"serverLicensePrompt" : " " ,
300
300
" https://login.posit.cloud" ,
301
301
" https://connect.posit.cloud" ,
302
302
" https://login.staging.posit.cloud" ,
303
- " https://staging.connect.posit.cloud"
303
+ " https://staging.connect.posit.cloud" ,
304
+ " https://posit.co"
304
305
],
305
306
"extensionsEnabledWithApiProposalVersion" : [
306
307
" GitHub.copilot-chat"
Original file line number Diff line number Diff line change @@ -83,12 +83,13 @@ else {
83
83
reportIssueUrl : 'https://github.com/posit-dev/positron/issues/new' ,
84
84
licenseName : 'Software Evaluation License' ,
85
85
licenseUrl : 'https://github.com/posit-dev/positron/tree/main?tab=License-1-ov-file' ,
86
- serverLicenseUrl : 'https://github.com/posit-dev/positron/tree/main?tab=License-1-ov-file ' ,
86
+ serverLicenseUrl : 'https://posit.co/about/eula/ ' ,
87
87
linkProtectionTrustedDomains : [
88
88
'https://open-vsx.org' ,
89
89
'https://github.com/posit-dev/positron' ,
90
90
'https://positron.posit.co' ,
91
91
'https://github.com/login/device' ,
92
+ 'https://posit.co'
92
93
]
93
94
// --- End Positron ---
94
95
} ) ;
Original file line number Diff line number Diff line change @@ -242,7 +242,10 @@ class OpenRequestFeatureUrlAction extends Action2 {
242
242
class OpenLicenseUrlAction extends Action2 {
243
243
244
244
static readonly ID = 'workbench.action.openLicenseUrl' ;
245
- static readonly AVAILABLE = ! ! ( isWeb ? product . serverLicense : product . licenseUrl ) ;
245
+ // --- Start Positron ---
246
+ // modify to be available in web by checking product.serverLicenseUrl instead of product.serverLicense
247
+ static readonly AVAILABLE = ! ! ( isWeb ? product . serverLicenseUrl : product . licenseUrl ) ;
248
+ // --- End Positron ---
246
249
247
250
constructor ( ) {
248
251
super ( {
@@ -267,12 +270,16 @@ class OpenLicenseUrlAction extends Action2 {
267
270
const url = isWeb ? productService . serverLicenseUrl : productService . licenseUrl ;
268
271
269
272
if ( url ) {
270
- if ( language ) {
273
+ // --- Start Positron ---
274
+ // we don't need the language but it's kept here to make merge conflicts easier to resolve
275
+ // checks !productService to never enter that code path since we don't need language
276
+ if ( language && ! productService ) {
271
277
const queryArgChar = url . indexOf ( '?' ) > 0 ? '&' : '?' ;
272
278
openerService . open ( URI . parse ( `${ url } ${ queryArgChar } lang=${ language } ` ) ) ;
273
279
} else {
274
280
openerService . open ( URI . parse ( url ) ) ;
275
281
}
282
+ // --- End Positron ---
276
283
}
277
284
}
278
285
}
You can’t perform that action at this time.
0 commit comments