Skip to content

Commit

Permalink
Merge branch 'master' into sso
Browse files Browse the repository at this point in the history
  • Loading branch information
syl-p committed Jan 2, 2024
2 parents 2da3d89 + 233425a commit 0d197ea
Show file tree
Hide file tree
Showing 98 changed files with 15,606 additions and 42,386 deletions.
18 changes: 0 additions & 18 deletions .browserslistrc

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -67,4 +67,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
cypress-run:
runs-on: ubuntu-latest
container:
image: cypress/browsers:node16.18.0-chrome90-ff88
image: cypress/browsers:latest
options: --user 1001
steps:
- name: Checkout
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ speed-measure-plugin*.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
yarn 1.22.19
nodejs 16.17.0
nodejs 20.10.0
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ To translate the software, we invite you to visit the [related repository](https
![CI](https://github.com/lincnil/pia/workflows/integration-tests/badge.svg?branch=master)
[![CodeQL](https://github.com/LINCnil/pia/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/LINCnil/pia/actions/workflows/codeql-analysis.yml)

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.0.1.
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 15.2.10.

NodeJs version: 16.17.0
NodeJs version: 20.10.0

## Package Version

Expand Down
34 changes: 9 additions & 25 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": true,
"assets": [
{
"glob": "**/*",
Expand Down Expand Up @@ -55,7 +54,13 @@
"node_modules/tinymce/plugins/lists/plugin.js",
"node_modules/tinymce/plugins/autoresize/plugin.js",
"node_modules/intro.js/intro.js"
]
],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
Expand Down Expand Up @@ -87,7 +92,8 @@
"serviceWorker": true,
"ngswConfigPath": "ngsw-config.json"
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand Down Expand Up @@ -122,17 +128,6 @@
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": ["**/node_modules/**"]
}
},
"e2e": {
"builder": "ngx-cypress-builder:cypress",
"options": {
Expand Down Expand Up @@ -171,21 +166,10 @@
"tsConfig": "projects/pia-i18n/tsconfig.spec.json",
"karmaConfig": "projects/pia-i18n/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/pia-i18n/tsconfig.lib.json",
"projects/pia-i18n/tsconfig.spec.json"
],
"exclude": ["**/node_modules/**"]
}
}
}
}
},
"defaultProject": "pia-angular",
"cli": {
"analytics": false
}
Expand Down
Loading

0 comments on commit 0d197ea

Please sign in to comment.