Commit 5cb7d57f83b6811bb7ecb6cc1f724bb417d3d3d2

Authored by Marcelo Puebla
Exists in develop

Merge branch 'develop' into 'develop'

Develop

See merge request !145
1 { 1 {
2 "name": "autoservicio-axion", 2 "name": "autoservicio-axion",
3 "version": "1.0.0", 3 "version": "1.0.1",
4 "main": "main.js", 4 "main": "main.js",
5 "scripts": { 5 "scripts": {
6 "ng": "ng", 6 "ng": "ng",
7 "start": "ng serve --port 4206 --host 0.0.0.0 --disableHostCheck", 7 "start": "ng serve --port 4206 --host 0.0.0.0 --disableHostCheck",
8 "build": "ng build", 8 "build": "ng build",
9 "build-prod": "ng build --prod", 9 "build-prod": "ng build --prod",
10 "test": "ng test", 10 "test": "ng test",
11 "lint": "ng lint", 11 "lint": "ng lint",
12 "e2e": "ng e2e", 12 "e2e": "ng e2e",
13 "electron": "electron .", 13 "electron": "electron .",
14 "electron-build": "ng build --prod && electron .", 14 "electron-build": "ng build --prod && electron .",
15 "build-exe": "electron-packager . --platform=win32 --arch=x64 --asar --icon=src/favicon.ico" 15 "build-exe": "electron-packager . --platform=win32 --arch=x64 --asar --icon=src/favicon.ico"
16 }, 16 },
17 "private": true, 17 "private": true,
18 "dependencies": { 18 "dependencies": {
19 "@angular/animations": "~8.2.14", 19 "@angular/animations": "~8.2.14",
20 "@angular/common": "~8.2.14", 20 "@angular/common": "~8.2.14",
21 "@angular/compiler": "~8.2.14", 21 "@angular/compiler": "~8.2.14",
22 "@angular/core": "~8.2.14", 22 "@angular/core": "~8.2.14",
23 "@angular/forms": "~8.2.14", 23 "@angular/forms": "~8.2.14",
24 "@angular/platform-browser": "~8.2.14", 24 "@angular/platform-browser": "~8.2.14",
25 "@angular/platform-browser-dynamic": "~8.2.14", 25 "@angular/platform-browser-dynamic": "~8.2.14",
26 "@angular/router": "~8.2.14", 26 "@angular/router": "~8.2.14",
27 "@types/jquery": "^3.3.31", 27 "@types/jquery": "^3.3.31",
28 "bootstrap": "^4.4.1", 28 "bootstrap": "^4.4.1",
29 "electron-debug": "^3.0.1", 29 "electron-debug": "^3.0.1",
30 "hammerjs": "^2.0.8", 30 "hammerjs": "^2.0.8",
31 "jquery": "^3.4.1", 31 "jquery": "^3.4.1",
32 "js-sha256": "^0.9.0", 32 "js-sha256": "^0.9.0",
33 "lodash": "^4.17.15", 33 "lodash": "^4.17.15",
34 "ng-connection-service": "^1.0.4", 34 "ng-connection-service": "^1.0.4",
35 "ngx-bootstrap": "^5.2.0", 35 "ngx-bootstrap": "^5.2.0",
36 "popper.js": "^1.16.0", 36 "popper.js": "^1.16.0",
37 "rxjs": "~6.4.0", 37 "rxjs": "~6.4.0",
38 "tslib": "^1.10.0", 38 "tslib": "^1.10.0",
39 "zone.js": "~0.9.1" 39 "zone.js": "~0.9.1"
40 }, 40 },
41 "devDependencies": { 41 "devDependencies": {
42 "@angular-devkit/build-angular": "~0.803.20", 42 "@angular-devkit/build-angular": "~0.803.20",
43 "@angular/cli": "~8.3.20", 43 "@angular/cli": "~8.3.20",
44 "@angular/compiler-cli": "~8.2.14", 44 "@angular/compiler-cli": "~8.2.14",
45 "@angular/language-service": "~8.2.14", 45 "@angular/language-service": "~8.2.14",
46 "@fortawesome/fontawesome-free": "^5.12.0", 46 "@fortawesome/fontawesome-free": "^5.12.0",
47 "@types/jasmine": "~3.3.8", 47 "@types/jasmine": "~3.3.8",
48 "@types/jasminewd2": "~2.0.3", 48 "@types/jasminewd2": "~2.0.3",
49 "@types/lodash": "^4.14.149", 49 "@types/lodash": "^4.14.149",
50 "@types/node": "~8.9.4", 50 "@types/node": "~8.9.4",
51 "codelyzer": "^5.0.0", 51 "codelyzer": "^5.0.0",
52 "devtron": "^1.4.0", 52 "devtron": "^1.4.0",
53 "electron": "^7.1.11", 53 "electron": "^7.1.11",
54 "jasmine-core": "~3.4.0", 54 "jasmine-core": "~3.4.0",
55 "jasmine-spec-reporter": "~4.2.1", 55 "jasmine-spec-reporter": "~4.2.1",
56 "karma": "~4.1.0", 56 "karma": "~4.1.0",
57 "karma-chrome-launcher": "~2.2.0", 57 "karma-chrome-launcher": "~2.2.0",
58 "karma-coverage-istanbul-reporter": "~2.0.1", 58 "karma-coverage-istanbul-reporter": "~2.0.1",
59 "karma-jasmine": "~2.0.1", 59 "karma-jasmine": "~2.0.1",
60 "karma-jasmine-html-reporter": "^1.4.0", 60 "karma-jasmine-html-reporter": "^1.4.0",
61 "protractor": "~5.4.0", 61 "protractor": "~5.4.0",
62 "ts-node": "~7.0.0", 62 "ts-node": "~7.0.0",
63 "tslint": "~5.15.0", 63 "tslint": "~5.15.0",
64 "typescript": "~3.5.3" 64 "typescript": "~3.5.3"
65 } 65 }
66 } 66 }
67 67