Merge branch 'UAT' of https://mygit.myhr.co.th/angular/mySkill-x into UAT
# Conflicts: # src/app/components/dashboard/dashboard-routing.module.ts # src/app/components/dashboard/dashboard.module.ts # src/app/shared/services/navservice.ts
Showing
| ... | @@ -33,6 +33,16 @@ | ... | @@ -33,6 +33,16 @@ |
| "@ng-select/ng-select": "^11.0.0", | "@ng-select/ng-select": "^11.0.0", | ||
| "@ngrx/store": "^16.0.1", | "@ngrx/store": "^16.0.1", | ||
| "@swimlane/ngx-charts": "^20.4.1", | "@swimlane/ngx-charts": "^20.4.1", | ||
| "@syncfusion/ej2-angular-base": "26.2.10", | |||
| "@syncfusion/ej2-angular-dropdowns": "26.2.13", | |||
| "@syncfusion/ej2-angular-grids": "26.2.14", | |||
| "@syncfusion/ej2-angular-inputs": "26.2.14", | |||
| "@syncfusion/ej2-base": "26.2.10", | |||
| "@syncfusion/ej2-buttons": "26.2.10", | |||
| "@syncfusion/ej2-data": "26.2.14", | |||
| "@syncfusion/ej2-dropdowns": "26.2.13", | |||
| "@syncfusion/ej2-grids": "26.2.14", | |||
| "@syncfusion/ej2-inputs": "26.2.14", | |||
| "@tailwindcss/forms": "^0.5.3", | "@tailwindcss/forms": "^0.5.3", | ||
| "angular-calendar": "^0.31.0", | "angular-calendar": "^0.31.0", | ||
| "angular2-multiselect-dropdown": "^5.0.4", | "angular2-multiselect-dropdown": "^5.0.4", | ||
| ... | @@ -42,6 +52,7 @@ | ... | @@ -42,6 +52,7 @@ |
| "browser-sync": "^2.29.3", | "browser-sync": "^2.29.3", | ||
| "chart.js": "^4.3.0", | "chart.js": "^4.3.0", | ||
| "date-fns": "^2.30.0", | "date-fns": "^2.30.0", | ||
| "echarts": "^5.6.0", | |||
| "firebase": "^8.10.1", | "firebase": "^8.10.1", | ||
| "glob-watcher": "^6.0.0", | "glob-watcher": "^6.0.0", | ||
| "hammerjs": "^2.0.8", | "hammerjs": "^2.0.8", | ||
| ... | @@ -62,7 +73,7 @@ | ... | @@ -62,7 +73,7 @@ |
| "ngx-daterangepicker-material": "^6.0.4", | "ngx-daterangepicker-material": "^6.0.4", | ||
| "ngx-drag-drop": "^16.0.0", | "ngx-drag-drop": "^16.0.0", | ||
| "ngx-dropzone": "^3.1.0", | "ngx-dropzone": "^3.1.0", | ||
| "ngx-echarts": "^16.0.0", | "ngx-echarts": "^16.2.0", | ||
| "ngx-editor": "^16.0.1", | "ngx-editor": "^16.0.1", | ||
| "ngx-mat-timepicker": "^16.0.2", | "ngx-mat-timepicker": "^16.0.2", | ||
| "ngx-owl-carousel-o": "^16.0.0", | "ngx-owl-carousel-o": "^16.0.0", | ||
| ... | @@ -78,17 +89,7 @@ | ... | @@ -78,17 +89,7 @@ |
| "swiper": "^8.4.6", | "swiper": "^8.4.6", | ||
| "tslib": "^2.5.3", | "tslib": "^2.5.3", | ||
| "wnumb": "^1.2.0", | "wnumb": "^1.2.0", | ||
| "zone.js": "~0.13.1", | "zone.js": "~0.13.1" | ||
| "@syncfusion/ej2-angular-base": "26.2.10", | |||
| "@syncfusion/ej2-angular-dropdowns": "26.2.13", | |||
| "@syncfusion/ej2-angular-grids": "26.2.14", | |||
| "@syncfusion/ej2-angular-inputs": "26.2.14", | |||
| "@syncfusion/ej2-base": "26.2.10", | |||
| "@syncfusion/ej2-buttons": "26.2.10", | |||
| "@syncfusion/ej2-data": "26.2.14", | |||
| "@syncfusion/ej2-dropdowns": "26.2.13", | |||
| "@syncfusion/ej2-grids": "26.2.14", | |||
| "@syncfusion/ej2-inputs": "26.2.14" | |||
| }, | }, | ||
| "devDependencies": { | "devDependencies": { | ||
| "@angular-devkit/build-angular": "^16.1.1", | "@angular-devkit/build-angular": "^16.1.1", | ||
| ... | ... |
Please
register
or
sign in
to comment