Skip to content

Commit

Permalink
Merge branch 'develop' into feature/4322
Browse files Browse the repository at this point in the history
Signed-off-by: Stepan Kiryakov <stepan.kiryakov@envisionblockchain.com>

# Conflicts:
#	frontend/src/app/app.module.ts
#	frontend/src/app/modules/schema-engine/document-view/document-view.component.ts
#	frontend/src/app/modules/schema-engine/schema-form-view/schema-form-view.component.ts
#	frontend/src/app/modules/schema-engine/schema-form/schema-form.component.ts
  • Loading branch information
Stepan-Kirjakov committed Dec 27, 2024
2 parents 53be341 + 924fab1 commit 0b6d7ff
Show file tree
Hide file tree
Showing 381 changed files with 11,225 additions and 23,333 deletions.
21 changes: 11 additions & 10 deletions frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@
"guardian": {
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"configurations": {
"development": {
"buildOptimizer": false,
"extractLicenses": false,
"extractLicenses": false,
"namedChunks": true,
"optimization": false,
"sourceMap": true,
"vendorChunk": true
"sourceMap": true
},
"production": {
"budgets": [
Expand Down Expand Up @@ -99,21 +97,24 @@
],
"index": "src/index.html",
"inlineStyleLanguage": "scss",
"main": "src/main.ts",
"outputPath": "dist/guardian",
"polyfills": "src/polyfills.ts",
"outputPath": {
"base": "dist/guardian"
},
"polyfills": [
"src/polyfills.ts"
],
"scripts": [
"./node_modules/leader-line/leader-line.min.js"
],
"styles": [
"./node_modules/@angular/material/legacy-prebuilt-themes/legacy-indigo-pink.css",
"./node_modules/ngx-toastr/toastr.css",
"./node_modules/primeng/resources/themes/saga-blue/theme.css",
"./node_modules/primeng/resources/primeng.min.css",
"./node_modules/primeicons/primeicons.css",
"src/styles.scss"
],
"tsConfig": "tsconfig.app.json"
"tsConfig": "tsconfig.app.json",
"browser": "src/main.ts"
}
},
"extract-i18n": {
Expand Down
Loading

0 comments on commit 0b6d7ff

Please sign in to comment.