Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-31 06:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'main' of github.com:wekan/wekan

Browse source
This commit is contained in:
Lauri Ojansivu 2024-11-11 17:46:43 +02:00
commit 0196f46094
11 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
CHANGELOG.md
View file

@ -27,6 +27,17 @@ This release adds the following updates:
Thanks to xet7.
- [Copied from Sandstorm developer discussions to docs fix for running Sandstorm at Ubuntu 24.04](https://github.com/wekan/wekan/commit/8ac9353c5313402e00160843ca57405ebeb128cb).
Thanks to xet7.
- [Update ldap-sync.py reference](https://github.com/wekan/wekan/pull/5555).
Thanks to emmanuel-ferdman.
- [Updated dependencies](https://github.com/wekan/wekan/commit/b24acefa6f6696b702f2c3ceb28d6d6290017bb2).
Thanks to developers of dependencies.
and fixes the following bugs:
- [Add more stack size](https://github.com/wekan/wekan/commit/324be07b859937966f98feb2aeea8f344c689bb0).
Thanks to xet7.
- [Fix Warning: missing space before text for line 210 of jade file client/components/activities/activities.jade](https://github.com/wekan/wekan/commit/a27f8ecfa9971740a019a955d3f8d0e5a5dd8dab).
Thanks to xet7.
Thanks to above GitHub users for their contributions and translators for their translations.

2
Dockerfile
View file

@ -272,4 +272,4 @@ WORKDIR /home/wekan/app
#
# CMD ["node", "/build/main.js"]
# CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /build/main.js"]
CMD ["bash", "-c", "ulimit -s 65500; exec node /build/main.js"]
CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 --max-old-space-size=8192 /build/main.js"]

2
Dockerfile.arm64v8
View file

@ -88,5 +88,5 @@ RUN \
EXPOSE $PORT
USER wekan
CMD ["bash", "-c", "ulimit -s 65500; exec node /home/wekan/bundle/main.js"]
CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 --max-old-space-size=8192 /home/wekan/bundle/main.js"]

2
client/components/activities/activities.jade
View file

@ -207,7 +207,7 @@ template(name="activity")
| {{_ 'activity-archived' (sanitize listLabel)}}.
if($eq activity.activityType 'changedListTitle')
{{_ 'activity-changedListTitle' (sanitize listLabel) boardLabelLink}}
| {{_ 'activity-changedListTitle' (sanitize listLabel) boardLabelLink}}
//- member activity ----------------------------------------------------
if($eq activity.activityType 'joinMember')

2
docs/Login/LDAP.md
View file

@ -1,6 +1,6 @@
## LDAP info
- [LDAP sync script, that also correctly removes users](https://github.com/wekan/wekan/blob/main/ldap-sync/ldap-sync.py)
- [LDAP sync script, that also correctly removes users](https://github.com/wekan/wekan/blob/main/docs/Login/ldap-sync/ldap-sync.py)
- [LDAP AD Simple Auth](LDAP-AD-Simple-Auth) 2021-07-24 and related [Search Filter Settings](https://github.com/wekan/wekan/issues/3908#issuecomment-887545168):
```

10
package-lock.json generated
View file

@ -1373,9 +1373,9 @@
"integrity": "sha512-SBbbYWvFYvsxHVL+q6ZB8lT3rp2LSvfALD2V52H+MGH2IgJsevy0VtXRkRG0EsUewwOaDTIKBn9DlD8HQ3GSwg=="
},
"meteor-node-stubs": {
"version": "1.2.10",
"resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.10.tgz",
"integrity": "sha512-zP1AVg8sOATz15yfy11R2VTx+IZFfAOXi8GuZa8tOfeVT1tKaqDooAbFylnIXwpStSu6HRBUhQqHtR06Qr9aEA==",
"version": "1.2.12",
"resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.12.tgz",
"integrity": "sha512-mzp3KI2aGNDhFlCVXPd0pfMr2z9A5vl1AqEgV13/z7AgKwcbd2X+ymE6tpSAMkrrQb40PU9PC2B59bCb6XkAaw==",
"requires": {
"@meteorjs/crypto-browserify": "^3.12.1",
"assert": "^2.1.0",
@ -1384,7 +1384,7 @@
"console-browserify": "^1.2.0",
"constants-browserify": "^1.0.0",
"domain-browser": "^4.23.0",
"elliptic": "^6.5.7",
"elliptic": "^6.6.0",
"events": "^3.3.0",
"https-browserify": "^1.0.0",
"os-browserify": "^0.3.0",
@ -1711,7 +1711,7 @@
"bundled": true
},
"elliptic": {
"version": "6.5.7",
"version": "6.6.0",
"bundled": true,
"requires": {
"bn.js": "^4.11.9",

2
package.json
View file

@ -44,7 +44,7 @@
"markdown-it-emoji": "^2.0.0",
"markdown-it-mathjax3": "^4.3.2",
"meteor-accounts-t9n": "^2.6.0",
"meteor-node-stubs": "^1.2.10",
"meteor-node-stubs": "^1.2.12",
"minio": "^7.1.3",
"moment": "^2.29.4",
"os": "^0.1.2",

2
releases/virtualbox/start-wekan.sh
View file

@ -411,6 +411,6 @@
#export WAIT_SPINNER=Bounce
#---------------------------------------------------------------------
node main.js & >> ~/repos/wekan.log
node --stack-size=65500 --max-old-space-size=8192 main.js & >> ~/repos/wekan.log
cd ~/repos
#done

2
snap-src/bin/wekan-control
View file

@ -36,4 +36,4 @@ cd $APPLICATION_DIRECTORY
# bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js"
#---------------------------------------------------------------------
#bash -c "ulimit -s 65500; exec $NODE_PATH/node --stack-size=65500 $APPLICATION_START"
bash -c "ulimit -s 65500; exec $NODE_PATH/node $APPLICATION_START"
bash -c "ulimit -s 65500; exec $NODE_PATH/node --stack-size=65500 --max-old-space-size=8192 $APPLICATION_START"

4
stacksmith/user-scripts/run.sh
View file

@ -20,9 +20,9 @@ echo "starting the wekan service..."
#---------------------------------------------------------------------
# https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132
# Add more Node heap:
export NODE_OPTIONS="--max_old_space_size=4096"
#export NODE_OPTIONS="--max_old_space_size=4096"
# Add more stack:
#bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js"
bash -c "ulimit -s 65500; exec node main.js"
bash -c "ulimit -s 65500; exec --stack-size=65500 --max-old-space-size=8192 node main.js"
#---------------------------------------------------------------------
#node main.js

2
start-wekan.sh
View file

@ -555,7 +555,7 @@
#bash -c "ulimit -s 65500; exec node --stack-size=65500 --trace-deprecation main.js"
#bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js"
#-------------------- OPTIONAL SETTINGS END ----------------------
bash -c "ulimit -s 65500; exec node main.js"
bash -c "ulimit -s 65500; exec node --stack-size=65500 --max-old-space-size=8192 main.js"
#node main.js
#---------------------------------------------------------------------
# & >> ../../wekan.log