Skip to content

Commit

Permalink
Merged in task/SHIBUI-1728 (pull request #461)
Browse files Browse the repository at this point in the history
Task/SHIBUI-1728

Approved-by: Dmitriy Kopylenko
  • Loading branch information
rmathis committed Feb 2, 2021
2 parents 268c760 + 1cb4865 commit a41fc8a
Show file tree
Hide file tree
Showing 150 changed files with 16,212 additions and 9,347 deletions.
3 changes: 3 additions & 0 deletions backend/src/main/resources/i18n/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,9 @@ label.restore-version=Restore Version ({ date })
label.saved=Saved
label.by=By

label.source=Metadata Source
label.provider=Metadata Provider

message.delete-user-title=Delete User?
message.delete-user-body=You are requesting to delete a user. If you complete this process the user will be removed. This cannot be undone. Do you wish to continue?

Expand Down
3 changes: 3 additions & 0 deletions backend/src/main/resources/i18n/messages_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,9 @@ label.enable=Enable
label.disable=Disable
label.enable-metadata-sources=Enable Metadata Sources

label.source=Metadata Source
label.provider=Metadata Provider

message.delete-user-title=Delete User?
message.delete-user-body=You are requesting to delete a user. If you complete this process the user will be removed. This cannot be undone. Do you wish to continue?

Expand Down
3 changes: 2 additions & 1 deletion ui/browserslist → ui/.browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
> 0.5%
last 2 versions
Firefox ESR
IE 11
IE 11
not IE 9-10
20 changes: 16 additions & 4 deletions ui/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,19 @@
"styles": [
"src/styles.scss"
],
"scripts": []
"scripts": [],
"aot": true,
"allowedCommonJsDependencies": [
"deep-object-diff",
"file-saver",
"jexl",
"z-schema"
]
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "bundles",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand All @@ -48,6 +53,12 @@
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
]
}
}
Expand Down Expand Up @@ -117,7 +128,8 @@
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "scss"
"styleext": "scss",
"style": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
Expand Down
Loading

0 comments on commit a41fc8a

Please sign in to comment.