Skip to content
Snippets Groups Projects
Commit 01ef0a3f authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch 'dev' into 'main'

Dev

See merge request !20
parents c7ce1270 2e6cf317
No related branches found
No related tags found
1 merge request!20Dev
Pipeline #44958 passed
image: alpine:3.17.1
trigger-root:
stage: deploy
variables:
GIT_STRATEGY: none
script:
- apk add --no-cache curl
- TARGET_BRANCH="$CI_COMMIT_BRANCH"
- if [ "$TARGET_BRANCH" = "main" ]; then TARGET_BRANCH="master"; fi
- echo $TARGET_BRANCH
- 'curl --fail --request POST --form "variables[ADITO_COMMIT_MESSAGE]=$CI_COMMIT_MESSAGE" --form "token=$PUSH_TRIGGER_TOKEN" --form "ref=$TARGET_BRANCH" "https://gitlab.adito.de/api/v4/projects/676/trigger/pipeline"'
rules:
- if: '$CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_BRANCH =~ /^2024/ || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH)'
when: on_success
\ No newline at end of file
@aditosoftware:registry=https://nexus.adito.cloud/repository/xrm
@aditosoftware:registry=https://gitlab.adito.de/api/v4/packages/npm/
\ No newline at end of file
......@@ -2,18 +2,32 @@
.git
.gitignore
.gitattributes
# Gitlab
.gitlab-ci.yml
README.md
CHANGELOG.md
# ADITO
.aditoprj
data
dist
others
scripts
jsconfig.json
jsconfig.template.json
.eslintrc.json
# NPM
node_modules
package.json
package-lock.json
.npmrc
\ No newline at end of file
.npmrc
# IntelliJ
.idea
# VS Code
.vscode
# Transpiler
cache.txt
cacheMods.txt
\ No newline at end of file
# platform
Module that bundles all platform modules
\ No newline at end of file
{
"name": "@aditosoftware/platform",
"version": "5.0.0",
"version": "6.0.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@aditosoftware/platform",
"version": "5.0.0",
"version": "6.0.0",
"dependencies": {
"@aditosoftware/attribute": "^2.0.1",
"@aditosoftware/document": "^3.0.1",
"@aditosoftware/event-handler": "^2.0.1",
"@aditosoftware/favorite": "^2.0.1",
"@aditosoftware/keyword": "^2.0.1",
"@aditosoftware/language": "^2.0.1",
"@aditosoftware/loghistory": "^3.0.1",
"@aditosoftware/loghistory-attribute": "^2.0.0",
"@aditosoftware/loghistory-keyword": "^2.0.0",
"@aditosoftware/notification": "^2.0.1",
"@aditosoftware/observation": "^2.0.1",
"@aditosoftware/offline": "^2.0.0",
"@aditosoftware/root": "^5.0.1",
"@aditosoftware/sharedalias": "^2.0.0",
"@aditosoftware/appointment": "^2.0.0",
"@aditosoftware/attribute": "^3.0.0",
"@aditosoftware/cti": "^1.0.0",
"@aditosoftware/document": "^4.0.0",
"@aditosoftware/event-handler": "^3.0.0",
"@aditosoftware/favorite": "^3.0.0",
"@aditosoftware/keyword": "^3.0.0",
"@aditosoftware/language": "^3.0.0",
"@aditosoftware/loghistory": "^4.0.0",
"@aditosoftware/loghistory-attribute": "^3.0.0",
"@aditosoftware/loghistory-keyword": "^3.0.0",
"@aditosoftware/notification": "^3.0.0",
"@aditosoftware/observation": "^3.0.0",
"@aditosoftware/offline": "^2.1.0",
"@aditosoftware/root": "^6.0.0",
"@aditosoftware/sharedalias": "^3.0.0",
"@aditosoftware/terminal": "^1.0.0",
"@aditosoftware/testing-utility": "^1.0.0",
"@aditosoftware/usermanagement": "^2.0.1",
"@aditosoftware/usermanagement-document": "^2.0.1",
"@aditosoftware/usermanagement-loghistory": "^2.0.0",
"@aditosoftware/usermanagement": "^3.0.0",
"@aditosoftware/usermanagement-document": "^3.0.0",
"@aditosoftware/usermanagement-loghistory": "^3.0.0",
"@aditosoftware/utility": "^2.0.0",
"@aditosoftware/workflow": "^2.0.1"
"@aditosoftware/workflow": "^3.0.0"
},
"devDependencies": {
"@aditosoftware/jdito-types": "^2024.0.2"
"@aditosoftware/jdito-types": ">=2024.2.0-RC <2024.2.1"
}
},
"@aditosoftware/document": {
"version": "3.0.1"
"version": "3.0.1",
"extraneous": true
},
"@aditosoftware/event-handler": {
"version": "2.0.1"
"version": "2.0.1",
"extraneous": true
},
"@aditosoftware/favorite": {
"version": "2.0.1"
"version": "2.0.1",
"extraneous": true
},
"@aditosoftware/jdito-types": {
"version": "2024.1.0",
"resolved": "https://nexus.adito.cloud/repository/xrm/@aditosoftware/jdito-types/-/jdito-types-2024.1.0.tgz",
"integrity": "sha512-i1b0QeqjsJ2jflTvhrt38bGpPC+KUUtSrL2HGP0+Bbpim6GYyXmwizu3X+jgOY+jR7PzDVTAGLdoDU6wxJ3ZOQ==",
"dev": true
"extraneous": true
},
"@aditosoftware/keyword": {
"version": "2.0.2",
"resolved": "https://nexus.adito.cloud/repository/xrm/@aditosoftware/keyword/-/keyword-2.0.2.tgz",
"integrity": "sha512-YI+Lpkz1HFLbpTekiWlpU8qY6R8cPbCwUMQ3MIv97uOuEDAEbYeL9jUhs5fwfiwT2kciBiO5DGk9V5kG+1IwyA=="
"integrity": "sha512-YI+Lpkz1HFLbpTekiWlpU8qY6R8cPbCwUMQ3MIv97uOuEDAEbYeL9jUhs5fwfiwT2kciBiO5DGk9V5kG+1IwyA==",
"extraneous": true
},
"@aditosoftware/language": {
"version": "2.0.1"
"version": "2.0.1",
"extraneous": true
},
"@aditosoftware/loghistory": {
"version": "3.0.1"
"version": "3.0.1",
"extraneous": true
},
"@aditosoftware/loghistory-attribute": {
"version": "2.0.0"
"version": "2.0.0",
"extraneous": true
},
"@aditosoftware/loghistory-keyword": {
"version": "2.0.0"
"version": "2.0.0",
"extraneous": true
},
"@aditosoftware/notification": {
"version": "2.0.1"
"version": "2.0.1",
"extraneous": true
},
"@aditosoftware/observation": {
"version": "2.0.1"
"version": "2.0.1",
"extraneous": true
},
"@aditosoftware/offline": {
"version": "2.0.0"
},
"node_modules/@aditosoftware/root": {
"version": "5.0.1",
"resolved": "https://nexus.adito.cloud/repository/xrm/@aditosoftware/root/-/root-5.0.1.tgz",
"integrity": "sha512-66rvZIVDOIiuomKB1BpNHssAaUFxdQRcO0OgMR3HcjSMHh8SKxgwukzAERc8rD5QPupPO5+wK4tgpkQtUHPzMQ==",
"peerDependencies": {
"@aditosoftware/sharedalias": "^2.0.0",
"@aditosoftware/utility": "^2.0.0"
}
},
"node_modules/@aditosoftware/sharedalias": {
"version": "2.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/sharedalias/-/@aditosoftware/sharedalias-2.0.0.tgz",
"integrity": "sha1-gPUXkz/wVGMEzDg6FdG6eAoabi4="
"extraneous": true
},
"@aditosoftware/terminal": {
"version": "1.0.0"
"version": "1.0.0",
"extraneous": true
},
"@aditosoftware/testing-utility": {
"version": "1.0.0"
"version": "1.0.0",
"extraneous": true
},
"@aditosoftware/usermanagement": {
"version": "2.0.1"
"version": "2.0.1",
"extraneous": true
},
"@aditosoftware/usermanagement-document": {
"version": "2.0.1"
"version": "2.0.1",
"extraneous": true
},
"@aditosoftware/usermanagement-loghistory": {
"version": "2.0.0"
"version": "2.0.0",
"extraneous": true
},
"@aditosoftware/utility": {
"version": "2.0.0"
"version": "2.0.0",
"extraneous": true
},
"@aditosoftware/workflow": {
"version": "2.0.2",
"resolved": "https://nexus.adito.cloud/repository/xrm/@aditosoftware/workflow/-/workflow-2.0.2.tgz",
"integrity": "sha512-f3cDRImbkzE4i7nHLdne0TtP3zsqSePwkKekUzU3Xlfrd5uNNfgljwNl1s6uvVDrHFRW9vKIPndkbqPawiS9AQ=="
"integrity": "sha512-f3cDRImbkzE4i7nHLdne0TtP3zsqSePwkKekUzU3Xlfrd5uNNfgljwNl1s6uvVDrHFRW9vKIPndkbqPawiS9AQ==",
"extraneous": true
},
"node_modules/@aditosoftware/appointment": {
"version": "2.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/appointment/-/@aditosoftware/appointment-2.0.0.tgz",
"integrity": "sha1-E2A8PQnFuJk/z5l++N/3G0Wuir4=",
"peerDependencies": {
"@aditosoftware/keyword": "^3.0.0",
"@aditosoftware/root": "^6.0.0",
"@aditosoftware/sharedalias": "^3.0.0",
"@aditosoftware/usermanagement": "^3.0.0",
"@aditosoftware/utility": "^2.0.0"
}
},
"node_modules/@aditosoftware/attribute": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/attribute/-/@aditosoftware/attribute-3.0.0.tgz",
"integrity": "sha1-I6/lSkvG6yCgVr+IX1YqFQLAf6U=",
"peerDependencies": {
"@aditosoftware/keyword": "^3.0.0",
"@aditosoftware/root": "^6.0.0",
"@aditosoftware/utility": "^2.0.0"
}
},
"node_modules/@aditosoftware/cti": {
"version": "1.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/cti/-/@aditosoftware/cti-1.0.0.tgz",
"integrity": "sha1-aPTiA2rWToAPRH6Hlr+DSyaBVDc=",
"peerDependencies": {
"@aditosoftware/keyword": "^3.0.0",
"@aditosoftware/sharedalias": "^3.0.0"
}
},
"node_modules/@aditosoftware/document": {
"version": "4.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/document/-/@aditosoftware/document-4.0.0.tgz",
"integrity": "sha1-c7nXqoPNurjd95VG0qCCv3TIC08=",
"peerDependencies": {
"@aditosoftware/event-handler": "^3.0.0",
"@aditosoftware/root": "^6.0.0",
"@aditosoftware/utility": "^2.0.0"
}
},
"node_modules/@aditosoftware/event-handler": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/event-handler/-/@aditosoftware/event-handler-3.0.0.tgz",
"integrity": "sha1-vEoEghoJCKfuON5oIrfA148WGIw=",
"peerDependencies": {
"@aditosoftware/root": "^6.0.0"
}
},
"node_modules/@aditosoftware/favorite": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/favorite/-/@aditosoftware/favorite-3.0.0.tgz",
"integrity": "sha1-GcgrC9RpjYdx3T3XaCAxs13SfPc=",
"peerDependencies": {
"@aditosoftware/root": "^6.0.0",
"@aditosoftware/utility": "^2.1.0"
}
},
"node_modules/@aditosoftware/jdito-types": {
"version": "2024.2.0-TEST6",
"resolved": "https://gitlab.adito.de/api/v4/projects/1372/packages/npm/@aditosoftware/jdito-types/-/@aditosoftware/jdito-types-2024.2.0-TEST6.tgz",
"integrity": "sha1-jMwdORSv69f5Jv2Renp+A6wxjn8=",
"dev": true
},
"node_modules/@aditosoftware/keyword": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/keyword/-/@aditosoftware/keyword-3.0.0.tgz",
"integrity": "sha1-+yPUtCtZ3wWFDcocbPAlC9NPmGc=",
"peerDependencies": {
"@aditosoftware/root": "^6.0.0",
"@aditosoftware/utility": "^2.0.0"
}
},
"node_modules/@aditosoftware/language": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/language/-/@aditosoftware/language-3.0.0.tgz",
"integrity": "sha1-RDrraUtLY6zw6K0WI69VUaERbr8=",
"peerDependencies": {
"@aditosoftware/root": "^6.0.0",
"@aditosoftware/utility": "^2.1.0"
}
},
"node_modules/@aditosoftware/loghistory": {
"version": "4.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/loghistory/-/@aditosoftware/loghistory-4.0.0.tgz",
"integrity": "sha1-l8lHWbNniAwkUYDJsWm9Iw+rlfE=",
"peerDependencies": {
"@aditosoftware/root": "^6.0.0",
"@aditosoftware/utility": "^2.0.0"
}
},
"node_modules/@aditosoftware/loghistory-attribute": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/loghistory-attribute/-/@aditosoftware/loghistory-attribute-3.0.0.tgz",
"integrity": "sha1-5euUPjiLPNGk5f8w4TXJZybik1o=",
"peerDependencies": {
"@aditosoftware/attribute": "^3.0.0",
"@aditosoftware/loghistory": "^4.0.0"
}
},
"node_modules/@aditosoftware/loghistory-keyword": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/loghistory-keyword/-/@aditosoftware/loghistory-keyword-3.0.0.tgz",
"integrity": "sha1-PwHHhBRd5wexjRqTgF6/2Ut1s3I=",
"peerDependencies": {
"@aditosoftware/keyword": "^3.0.0",
"@aditosoftware/loghistory": "^4.0.0"
}
},
"node_modules/@aditosoftware/notification": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/notification/-/@aditosoftware/notification-3.0.0.tgz",
"integrity": "sha1-wA27HBBJpM29p/uy+tEakia2tYk=",
"peerDependencies": {
"@aditosoftware/keyword": "^3.0.0",
"@aditosoftware/root": "^6.0.0",
"@aditosoftware/sharedalias": "^3.0.0",
"@aditosoftware/utility": "^2.0.0"
}
},
"node_modules/@aditosoftware/observation": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/observation/-/@aditosoftware/observation-3.0.0.tgz",
"integrity": "sha1-6MRfYhuE06A3hrzyiidRR7dyM2U=",
"peerDependencies": {
"@aditosoftware/event-handler": "^3.0.0",
"@aditosoftware/keyword": "^3.0.0",
"@aditosoftware/root": "^6.0.0",
"@aditosoftware/utility": "^2.1.0"
}
},
"node_modules/@aditosoftware/offline": {
"version": "2.1.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/offline/-/@aditosoftware/offline-2.1.0.tgz",
"integrity": "sha1-fd0IuvPlcj6Kfzso//JTmsFeC7c=",
"peerDependencies": {
"@aditosoftware/utility": "^2.0.0"
}
},
"node_modules/@aditosoftware/root": {
"version": "6.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/root/-/@aditosoftware/root-6.0.0.tgz",
"integrity": "sha1-TL5CHljvFpDm5twP3lEbWvWQutg=",
"peerDependencies": {
"@aditosoftware/sharedalias": "^3.0.0",
"@aditosoftware/utility": "^2.0.0"
}
},
"node_modules/@aditosoftware/sharedalias": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/sharedalias/-/@aditosoftware/sharedalias-3.0.0.tgz",
"integrity": "sha1-7mTq56EkVuUDOpGcobr2cpu40U8="
},
"node_modules/@aditosoftware/terminal": {
"version": "1.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/terminal/-/@aditosoftware/terminal-1.0.0.tgz",
"integrity": "sha1-DQZiIqEqW5/pA3OG2qY5tji0lGY="
},
"node_modules/@aditosoftware/testing-utility": {
"version": "1.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/testing-utility/-/@aditosoftware/testing-utility-1.0.0.tgz",
"integrity": "sha1-GJK4D8t8F035+WU6QTbKYv2K+XQ=",
"peerDependencies": {
"@aditosoftware/terminal": "^1.0.0"
}
},
"node_modules/@aditosoftware/usermanagement": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/usermanagement/-/@aditosoftware/usermanagement-3.0.0.tgz",
"integrity": "sha1-tNE/FNJajM3Agu2tEKRvrHDr/jA=",
"peerDependencies": {
"@aditosoftware/attribute": "^3.0.0",
"@aditosoftware/event-handler": "^3.0.0",
"@aditosoftware/keyword": "^3.0.0",
"@aditosoftware/root": "^6.0.0",
"@aditosoftware/sharedalias": "^3.0.0",
"@aditosoftware/utility": "^2.1.0"
}
},
"node_modules/@aditosoftware/usermanagement-document": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/usermanagement-document/-/@aditosoftware/usermanagement-document-3.0.0.tgz",
"integrity": "sha1-sDH69RaqI+qwRVaG4QJlqN1DYZE=",
"peerDependencies": {
"@aditosoftware/document": "^4.0.0",
"@aditosoftware/usermanagement": "^3.0.0",
"@aditosoftware/utility": "^2.0.0"
}
},
"node_modules/@aditosoftware/usermanagement-loghistory": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/usermanagement-loghistory/-/@aditosoftware/usermanagement-loghistory-3.0.0.tgz",
"integrity": "sha1-YUfxvNBjVhUpGPk53tGVLF6QHw4=",
"peerDependencies": {
"@aditosoftware/loghistory": "^4.0.0",
"@aditosoftware/usermanagement": "^3.0.0"
}
},
"node_modules/@aditosoftware/utility": {
"version": "2.1.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/utility/-/@aditosoftware/utility-2.1.0.tgz",
"integrity": "sha1-LuwDAc9xjH33uGtE7wGSuDAgLcA=",
"peerDependencies": {
"@aditosoftware/testing-utility": "^1.0.0"
}
},
"node_modules/@aditosoftware/workflow": {
"version": "3.0.0",
"resolved": "https://gitlab.adito.de/api/v4/projects/1375/packages/npm/@aditosoftware/workflow/-/@aditosoftware/workflow-3.0.0.tgz",
"integrity": "sha1-4kH39PnzDgUSxc5dc/zp+HXI1N4=",
"peerDependencies": {
"@aditosoftware/event-handler": "^3.0.0",
"@aditosoftware/keyword": "^3.0.0",
"@aditosoftware/root": "^6.0.0",
"@aditosoftware/utility": "^2.1.0"
}
}
}
}
{
"name": "@aditosoftware/platform",
"version": "5.0.0",
"version": "6.0.0",
"adito": {
"type": "module"
},
"dependencies": {
"@aditosoftware/attribute": "^2.0.1",
"@aditosoftware/document": "^3.0.1",
"@aditosoftware/event-handler": "^2.0.1",
"@aditosoftware/favorite": "^2.0.1",
"@aditosoftware/keyword": "^2.0.1",
"@aditosoftware/language": "^2.0.1",
"@aditosoftware/loghistory": "^3.0.1",
"@aditosoftware/loghistory-attribute": "^2.0.0",
"@aditosoftware/loghistory-keyword": "^2.0.0",
"@aditosoftware/notification": "^2.0.1",
"@aditosoftware/observation": "^2.0.1",
"@aditosoftware/offline": "^2.0.0",
"@aditosoftware/root": "^5.0.1",
"@aditosoftware/sharedalias": "^2.0.0",
"@aditosoftware/attribute": "^3.0.0",
"@aditosoftware/document": "^4.0.0",
"@aditosoftware/event-handler": "^3.0.0",
"@aditosoftware/favorite": "^3.0.0",
"@aditosoftware/keyword": "^3.0.0",
"@aditosoftware/language": "^3.0.0",
"@aditosoftware/loghistory": "^4.0.0",
"@aditosoftware/loghistory-attribute": "^3.0.0",
"@aditosoftware/loghistory-keyword": "^3.0.0",
"@aditosoftware/notification": "^3.0.0",
"@aditosoftware/observation": "^3.0.0",
"@aditosoftware/offline": "^2.1.0",
"@aditosoftware/root": "^6.0.0",
"@aditosoftware/sharedalias": "^3.0.0",
"@aditosoftware/terminal": "^1.0.0",
"@aditosoftware/testing-utility": "^1.0.0",
"@aditosoftware/usermanagement": "^2.0.1",
"@aditosoftware/usermanagement-document": "^2.0.1",
"@aditosoftware/usermanagement-loghistory": "^2.0.0",
"@aditosoftware/usermanagement": "^3.0.0",
"@aditosoftware/usermanagement-document": "^3.0.0",
"@aditosoftware/usermanagement-loghistory": "^3.0.0",
"@aditosoftware/utility": "^2.0.0",
"@aditosoftware/workflow": "^2.0.1"
},
"overrides": {
"@aditosoftware/root": "^5.0.1",
"@aditosoftware/sharedalias": "^2.0.0"
"@aditosoftware/workflow": "^3.0.0",
"@aditosoftware/appointment": "^2.0.0",
"@aditosoftware/cti": "^1.0.0"
},
"devDependencies": {
"@aditosoftware/jdito-types": "^2024.0.2"
"@aditosoftware/jdito-types": ">=2024.2.0-RC <2024.2.1"
},
"scripts": {
"update package-lock": "npm update --package-lock=false --package-lock-only --strict-peer-deps",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment