Commit 6972d381 authored by Kristjan Kruus's avatar Kristjan Kruus

Merge pull request #74 in RIHA/riha-browser from...

Merge pull request #74 in RIHA/riha-browser from bugfix/RIHAKB-924-tosta-riha-frontendis-jquery-versioon-3.4.1-3.5.0 to develop

* commit '0ea501f0': (27 commits)
  Version up
  upgrades
  upgrades
  zone.js upgrade
  karma-jasmine upgrade
  karma upgrade test
  protractor upgrade test
  ts-node upgrade
  revert typescript upgrade
  typescript partial upgrade
  moment upgrade
  revert bootstrap version
  test upgrade
  Angular upgrades
  angular upgrade
  upgrade
  consolidate dependencies
  angular upgrade
  jasmine upgrade
  upgrade
  ...
parents 263c93ea 0ea501f0
......@@ -11,7 +11,7 @@
<parent>
<artifactId>browser</artifactId>
<groupId>ee.ria.riha</groupId>
<version>7.6.5</version>
<version>7.6.6</version>
</parent>
<properties>
......
......@@ -12,7 +12,7 @@
<parent>
<groupId>ee.ria.riha</groupId>
<artifactId>browser</artifactId>
<version>7.6.5</version>
<version>7.6.6</version>
</parent>
<dependencies>
......
{
"name": "riha",
"version": "0.0.0",
"version": "7.6.6",
"license": "MIT",
"scripts": {
"static": "static ../main/resources --port 8085",
......@@ -26,46 +26,46 @@
"@angular/platform-server": "^8.2.11",
"@angular/router": "^8.2.11",
"@ng-bootstrap/ng-bootstrap": "^5.1.0",
"@ngx-translate/core": "^11.0",
"@ngx-translate/core": "12.1.2",
"@ngx-translate/http-loader": "^4.0",
"angular-in-memory-web-api": "^0.9.0",
"bootstrap-4": "^4.0.0",
"core-js": "^3.3.0",
"enhanced-resolve": "^4.1.0",
"font-awesome": "^4.7.0",
"jquery": "^3.4.1",
"jquery": "^3.5.1",
"linkifyjs": "~2.1.5",
"lodash": "^4.17.11",
"moment": "~2.24.0",
"moment": "2.25.3",
"ng2-validation": "4.2.0",
"ngx-chips": "^2.1.0",
"ngx-toastr": "^11.1.0",
"ngx-toastr": "11.3.3",
"ngx-ui-switch": "^8.2.0",
"poor-mans-proxy": "1.0.0",
"rxjs": "^6.5.3",
"tslib": "^1.10.0",
"zone.js": "~0.9.0"
"zone.js": "0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.803.10",
"@angular/cli": "^8.3.10",
"@angular/compiler-cli": "^8.2.11",
"@types/jasmine": "^3.4.0",
"@types/node": "~12.11.0",
"@types/node": "13.13.5",
"codelyzer": "^5.0.1",
"jasmine-core": "^3.5.0",
"jasmine-spec-reporter": "~4.2.0",
"karma": "~4.4.0",
"jasmine-spec-reporter": "5.0.2",
"karma": "5.0.4",
"karma-chrome-launcher": "~3.1.0",
"karma-cli": "~2.0.0",
"karma-coverage-istanbul-reporter": "^2.1.0",
"karma-jasmine": "~2.0.0",
"karma-coverage-istanbul-reporter": "3.0.2",
"karma-jasmine": "3.1.1",
"karma-jasmine-html-reporter": "^1.4.0",
"karma-phantomjs-launcher": "^1.0.4",
"node-static": "^0.7.9",
"protractor": "~5.4.0",
"ts-node": "~8.4.0",
"tslint": "~5.20.0",
"typescript": "~3.5.0"
"protractor": "6.0.0-beta",
"ts-node": "8.10.1",
"tslint": "6.1.2",
"typescript": "^3.5.3"
}
}
......@@ -10,7 +10,7 @@
<parent>
<groupId>ee.ria.riha</groupId>
<artifactId>browser</artifactId>
<version>7.6.5</version>
<version>7.6.6</version>
</parent>
<properties>
......
This diff is collapsed.
......@@ -5,7 +5,7 @@
<groupId>ee.ria.riha</groupId>
<artifactId>browser</artifactId>
<version>7.6.5</version>
<version>7.6.6</version>
<packaging>pom</packaging>
<name>RIHA-Browser</name>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment