Skip to content

Commit

Permalink
Merge branch '1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
Lomilar committed May 29, 2024
2 parents b25a1e4 + 1ab4ea6 commit 2b381bf
Show file tree
Hide file tree
Showing 8 changed files with 187 additions and 323 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## 1.5.57
* Updated editor.
* Updated libraries.
* Can now multiget versioned entities.

## 1.5.56
* Merged PRs #307, #316 for P1 compatibility.
* OpenAPI swagger.json now validates.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# CaSS
Competency and Skills Service -- Competency Management

Release Candidate: 1.5.56 [![Build Status](https://travis-ci.org/cassproject/CASS.svg?branch=1.5)](https://travis-ci.org/cassproject/CASS)
Release Candidate: 1.5.57 [![Build Status](https://travis-ci.org/cassproject/CASS.svg?branch=1.5)](https://travis-ci.org/cassproject/CASS)
Supported: 1.4 [![Build Status](https://travis-ci.org/cassproject/CASS.svg?branch=1.4)](https://travis-ci.org/cassproject/CASS)
Supported: 1.3 [![Build Status](https://travis-ci.org/cassproject/CASS.svg?branch=1.3)](https://travis-ci.org/cassproject/CASS)
Supported: 1.2 [![Build Status](https://travis-ci.org/cassproject/CASS.svg?branch=1.2)](https://travis-ci.org/cassproject/CASS)
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-template.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
cass:
image: cassproject/cass:node-1.5.56
image: cassproject/cass:node-1.5.57
container_name: cass
networks:
- esnet
Expand Down
489 changes: 174 additions & 315 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cass",
"version": "1.5.56",
"version": "1.5.57",
"description": "Competency and Skills System",
"main": "src/main/server.js",
"directories": {
Expand Down Expand Up @@ -105,7 +105,7 @@
"node-object-hash": "^2.3.10",
"node-worker-threads-pool": "^1.5.1",
"nodemailer": "^6.9.13",
"pm2": "^5.3.1",
"pm2": "^5.4.0",
"pure-uuid": "^1.8.1",
"rdflib": "^2.2.35",
"spdy": "^4.0.2",
Expand All @@ -120,7 +120,7 @@
"eslint": "^8.57.0",
"eslint-config-google": "^0.14.0",
"mocha": "^10.4.0",
"nodemon": "^3.1.0",
"nodemon": "^3.1.2",
"npm-run-all": "^4.1.5",
"nyc": "^15.1.0",
"wait-on": "^7.2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/main/server/skyRepo.js
Original file line number Diff line number Diff line change
Expand Up @@ -9482,7 +9482,7 @@ global.queryParse = function (urlRemainder) {
(result)['id'] = split[0];
}
if (split.length >= 2) {
(result)['type'] = split[0];
(result)['type'] = split[0] == '' ? null : split[0];
(result)['id'] = split[1];
}
if (split.length == 3) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"openapi": "3.0.0",
"info": {
"title": "CaSS",
"version": "1.5.56"
"version": "1.5.57"
},
"components": {
"parameters": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp
Submodule webapp updated 643 files

0 comments on commit 2b381bf

Please sign in to comment.