Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ff93d3f
analysis: add codeql-analysis
live-dev999 Nov 17, 2021
a16c91f
Merge branch 'LiveDevTeam:master' into master
live-dev999 Nov 17, 2021
44eb6ae
Merge branch 'LiveDevTeam:master' into master
live-dev999 Jan 9, 2022
5130b4a
Merge branch 'LiveDevTeam:master' into master
live-dev999 Feb 8, 2022
ddad692
build(deps): bump follow-redirects in /src/WebApps/pfr-app/c-gen
dependabot[bot] Feb 15, 2022
5fe8a3b
build(deps): bump follow-redirects in /src/WebApps/pfr-app/smalltalk
dependabot[bot] Feb 15, 2022
e337ebb
build(deps): bump follow-redirects in /src/WebApps/pfr-app/pfr-app
dependabot[bot] Feb 15, 2022
27d4161
Merge branch 'LiveDevTeam:master' into master
live-dev999 Mar 9, 2022
09b818a
build(deps): bump node-forge in /src/WebApps/pfr-app/pfr-app
dependabot[bot] Mar 26, 2022
9e4b088
build(deps): bump node-forge in /src/WebApps/pfr-app/c-gen
dependabot[bot] Mar 26, 2022
0f68230
chore(issue-113): fix main solution for services
live-dev999 Mar 27, 2022
ca0a3ee
build(deps): bump minimist in /src/WebApps/pfr-app/smalltalk
dependabot[bot] Apr 1, 2022
cf0455d
build(deps): bump minimist from 1.2.5 to 1.2.6 in /src/WebApps/pfr-ap…
live-dev999 Apr 2, 2022
b4e5b0c
build(deps): bump nanoid in /src/Services/auth/O2NextGen.Auth.Web
dependabot[bot] Apr 2, 2022
ea3d455
build(deps): bump minimist in /src/WebApps/pfr-app/pfr-app
dependabot[bot] Apr 2, 2022
5e9a890
build(pr-deps): bump minimist from 1.2.5 to 1.2.6 in /src/WebApps/pfr…
live-dev999 Apr 2, 2022
e879293
build(deps): bump minimist in /src/WebApps/pfr-app/c-gen
dependabot[bot] Apr 2, 2022
2c9528f
build(deps): bump minimist in /src/Services/auth/O2NextGen.Auth.Web
dependabot[bot] Apr 2, 2022
8ecb697
build(pr-deps): bump follow-redirects from 1.14.7 to 1.14.8 in /src/W…
live-dev999 Apr 2, 2022
023d6cd
build(pf-deps): bump follow-redirects from 1.14.7 to 1.14.8 in /src/W…
live-dev999 Apr 2, 2022
c6fe4a8
build(pr-deps): bump follow-redirects from 1.14.7 to 1.14.8 in /src/W…
live-dev999 Apr 2, 2022
8aec98a
build(pr-deps): bump node-forge from 1.2.1 to 1.3.0 in /src/WebApps/p…
live-dev999 Apr 2, 2022
6f0c5a6
build(deps): bump follow-redirects in /src/WebApps/pfr-app/server
dependabot[bot] Apr 2, 2022
31faad4
build(pr-deps): bump node-forge from 1.2.1 to 1.3.0 in /src/WebApps/p…
live-dev999 Apr 2, 2022
2bf2b2e
build(deps): bump node-forge in /src/WebApps/pfr-app/smalltalk
dependabot[bot] Apr 2, 2022
ba156d8
build(pr-deps): bump nanoid from 3.1.30 to 3.3.2 in /src/Services/aut…
live-dev999 Apr 2, 2022
e790642
build(pr-deps): bump minimist from 1.2.5 to 1.2.6 in /src/WebApps/pfr…
live-dev999 Apr 2, 2022
1de2587
build(pr-deps): bump minimist from 1.2.5 to 1.2.6 in /src/Services/au…
live-dev999 Apr 2, 2022
1ce2cc5
build(pr-deps): bump follow-redirects from 1.14.7 to 1.14.9 in /src/W…
live-dev999 Apr 2, 2022
185dc0b
build(pr-deps): bump node-forge from 1.2.1 to 1.3.1 in /src/WebApps/p…
live-dev999 Apr 2, 2022
f41987d
Merge branch 'master' into dev
Apr 2, 2022
8a1fba6
build(deps): bump node-forge in /src/WebApps/pfr-app/pfr-app
dependabot[bot] Apr 2, 2022
8d147b2
Merge remote-tracking branch 'upstream/dev' into dev
Apr 2, 2022
ede0043
Merge branch 'dev' into dependabot/npm_and_yarn/src/WebApps/pfr-app/p…
live-dev999 Apr 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
256 changes: 254 additions & 2 deletions src/O2NextGen-Prototypes.sln

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
},
"applicationUrl": "https://localhost:10001;http://localhost:5001"
},
//"Docker": {
// "commandName": "Docker",
// "launchBrowser": true,
// "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
// "publishAllPorts": true,
// "useSSL": true
//}
"Docker": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
"publishAllPorts": true,
"useSSL": true
}
}
}
6 changes: 3 additions & 3 deletions src/Services/auth/O2NextGen.Auth.Web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
},
"applicationUrl": "https://localhost:10002;http://localhost:5002"
},
//"Docker": {
// "commandName": "Docker",
// "launchBrowser": true,
// "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
// "publishAllPorts": true,
// "useSSL": true
//}
"Docker": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
"publishAllPorts": true,
"useSSL": true
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
},
"applicationUrl": "https://localhost:10004;http://localhost:5004"
},
//"Docker": {
// "commandName": "Docker",
// "launchBrowser": true,
// "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/api/values",
// "publishAllPorts": true,
// "useSSL": true
//}
"Docker": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/api/values",
"publishAllPorts": true,
"useSSL": true
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\O2.Tracker.DbUtility\O2NextGen.Tracker.DbUtility.csproj" />
<ProjectReference Include="..\O2NextGen.OnTracker.Business\O2NextGen.OnTracker.Business.csproj" />
<ProjectReference Include="..\O2NextGen.OnTracker.Data\O2NextGen.OnTracker.Data.csproj" />
<ProjectReference Include="..\O2NextGen.OnTracker.Impl\O2NextGen.OnTracker.Impl.csproj" />
<ProjectReference Include="..\O2NextGen.Tracker.DbUtility\O2NextGen.Tracker.DbUtility.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
},
"applicationUrl": "https://localhost:10003;http://localhost:5003"
},
//"Docker": {
// "commandName": "Docker",
// "launchBrowser": true,
// "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/api/values",
// "publishAllPorts": true,
// "useSSL": true
//}
"Docker": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/api/values",
"publishAllPorts": true,
"useSSL": true
}
}
}
6 changes: 3 additions & 3 deletions src/WebApps/pfr-app/c-gen/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3035,9 +3035,9 @@ minimatch@^3.0.4:
brace-expansion "^1.1.7"

minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
version "1.2.6"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==

mkdirp@^0.5.5:
version "0.5.5"
Expand Down
6 changes: 3 additions & 3 deletions src/WebApps/pfr-app/pfr-app/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3110,9 +3110,9 @@ node-emoji@^1.11.0:
lodash "^4.17.21"

node-forge@^1.2.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2"
integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==
version "1.3.1"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==

node-releases@^2.0.1:
version "2.0.1"
Expand Down
6 changes: 3 additions & 3 deletions src/WebApps/pfr-app/smalltalk/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3110,9 +3110,9 @@ node-emoji@^1.11.0:
lodash "^4.17.21"

node-forge@^1.2.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2"
integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==
version "1.3.1"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==

node-releases@^2.0.1:
version "2.0.1"
Expand Down