Skip to content

Commit

Permalink
Merge commit '641da88d8168c0fdda6f1bfad274e39721192fd5' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
davidjgraph committed Mar 23, 2024
2 parents 2c47e92 + 641da88 commit 436a66b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion drawio
Submodule drawio updated 52 files
+41 −0 ChangeLog
+1 −1 VERSION
+91 −0 docs/code-review.md
+17 −0 etc/imageResize/README.md
+84 −0 etc/imageResize/drawImageResize.js
+763 −0 etc/imageResize/package-lock.json
+17 −0 etc/imageResize/package.json
+7 −7 src/main/mxgraph/shape/mxShape.js
+2 −1 src/main/mxgraph/shape/mxText.js
+2 −1 src/main/mxgraph/util/mxSvgCanvas2D.js
+32 −0 src/main/mxgraph/util/mxUtils.js
+4 −7 src/main/mxgraph/view/mxGraphView.js
+2,323 −2,314 src/main/webapp/js/app.min.js
+1 −2 src/main/webapp/js/diagramly/App.js
+93 −44 src/main/webapp/js/diagramly/Dialogs.js
+10 −1 src/main/webapp/js/diagramly/DiffSync.js
+55 −2 src/main/webapp/js/diagramly/DrawioFile.js
+20 −1 src/main/webapp/js/diagramly/DrawioFileSync.js
+55 −26 src/main/webapp/js/diagramly/Editor.js
+61 −8 src/main/webapp/js/diagramly/EditorUi.js
+2 −2 src/main/webapp/js/diagramly/ElectronApp.js
+7 −18 src/main/webapp/js/diagramly/LocalFile.js
+22 −0 src/main/webapp/js/diagramly/Menus.js
+23 −4 src/main/webapp/js/diagramly/Pages.js
+55 −24 src/main/webapp/js/diagramly/Trees.js
+9 −4 src/main/webapp/js/diagramly/mxFreehand.js
+2 −2 src/main/webapp/js/grapheditor/Actions.js
+12 −1 src/main/webapp/js/grapheditor/EditorUi.js
+32 −19 src/main/webapp/js/grapheditor/Format.js
+58 −25 src/main/webapp/js/grapheditor/Graph.js
+3 −2 src/main/webapp/js/grapheditor/Init.js
+2,110 −2,101 src/main/webapp/js/integrate.min.js
+10 −10 src/main/webapp/js/stencils.min.js
+1,837 −1,831 src/main/webapp/js/viewer-static.min.js
+1,837 −1,831 src/main/webapp/js/viewer.min.js
+82 −82 src/main/webapp/mxgraph/mxClient.js
+21 −21 src/main/webapp/resources/dia_it.txt
+2 −2 src/main/webapp/resources/dia_nl.txt
+1 −1 src/main/webapp/service-worker.js
+1 −1 src/main/webapp/service-worker.js.map
+1 −1 src/main/webapp/shortcuts.svg
+0 −2 src/main/webapp/stencils/cisco/controllers_and_modules.xml
+0 −6 src/main/webapp/stencils/cisco/misc.xml
+3 −4 src/main/webapp/stencils/cisco/routers.xml
+0 −3 src/main/webapp/stencils/cisco/servers.xml
+0 −3 src/main/webapp/stencils/ios7/icons.xml
+0 −3 src/main/webapp/stencils/pid/agitators.xml
+0 −3 src/main/webapp/stencils/pid/compressors.xml
+0 −3 src/main/webapp/stencils/pid/compressors_iso.xml
+0 −3 src/main/webapp/stencils/pid/misc.xml
+0 −2 src/main/webapp/stencils/pid/pumps.xml
+1 −1 src/main/webapp/templates/basic/classes.xml
36 changes: 18 additions & 18 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -198,16 +198,16 @@
integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==

"@types/node@*":
version "20.11.25"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.25.tgz#0f50d62f274e54dd7a49f7704cc16bfbcccaf49f"
integrity sha512-TBHyJxk2b7HceLVGFcpAUjsa5zIdsPWlR6XHfyGzd0SFu+/NFgQgMAl96MSDZgQDvJAvV6BKsFOrt6zIL09JDw==
version "20.11.30"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.30.tgz#9c33467fc23167a347e73834f788f4b9f399d66f"
integrity sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==
dependencies:
undici-types "~5.26.4"

"@types/node@^18.11.18":
version "18.19.22"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.22.tgz#f622f92514b897e6b09903e97c16a0db8e94689f"
integrity sha512-p3pDIfuMg/aXBmhkyanPshdfJuX5c5+bQjYLIikPLXAUycEogij/c50n/C+8XOA5L93cU4ZRXtn+dNQGi0IZqQ==
version "18.19.26"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.26.tgz#18991279d0a0e53675285e8cf4a0823766349729"
integrity sha512-+wiMJsIwLOYCvUqSdKTrfkS8mpTp+MPINe6+Np4TAGFWWRWiBQ5kSq9nZGCSPkzx9mvT+uEukzpX4MOSCydcvw==
dependencies:
undici-types "~5.26.4"

Expand Down Expand Up @@ -844,9 +844,9 @@ electron-is-dev@^2.0.0:
integrity sha512-3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA==

electron-log@^5.0.2:
version "5.1.1"
resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.1.1.tgz#3341c0265339c6c8285a91840cb7c872008103d6"
integrity sha512-If7HU4Slbh2xfjOXOLxifkbgu6HmWDNJyXPLW+XNTOHMfFKisg0trA3d/7syyu25S+lHosfsd0VMfDSjGn1+Pw==
version "5.1.2"
resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.1.2.tgz#fb40ad7f4ae694dd0e4c02c662d1a65c03e1243e"
integrity sha512-Cpg4hAZ27yM9wzE77c4TvgzxzavZ+dVltCczParXN+Vb3jocojCSAuSMCVOI9fhFuuOR+iuu3tZLX1cu0y0kgQ==

electron-progressbar@^2.1.0:
version "2.2.1"
Expand Down Expand Up @@ -1204,9 +1204,9 @@ has-symbols@^1.0.3:
integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==

hasown@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa"
integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==
version "2.0.2"
resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
dependencies:
function-bind "^1.1.2"

Expand Down Expand Up @@ -1940,9 +1940,9 @@ supports-color@^7.1.0:
has-flag "^4.0.0"

tar@^6.1.12:
version "6.2.0"
resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
version "6.2.1"
resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"
Expand Down Expand Up @@ -1999,9 +1999,9 @@ type-fest@^2.17.0:
integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==

typescript@^5.3.3:
version "5.4.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372"
integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==
version "5.4.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff"
integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==

undici-types@~5.26.4:
version "5.26.5"
Expand Down

0 comments on commit 436a66b

Please sign in to comment.