summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitpod.Dockerfile10
-rw-r--r--.gitpod.yml4
-rw-r--r--.sandstorm-meteor-1.8/package-lock.json2
-rw-r--r--.sandstorm-meteor-1.8/package.json2
-rw-r--r--CHANGELOG.md28
-rw-r--r--Dockerfile3
-rw-r--r--README.md2
-rw-r--r--Stackerfile.yml2
-rw-r--r--client/components/boards/boardsList.jade4
-rw-r--r--client/components/boards/boardsList.js22
-rw-r--r--client/components/main/header.jade5
-rw-r--r--client/components/main/header.styl2
-rw-r--r--client/components/main/layouts.js5
-rw-r--r--config/router.js21
-rw-r--r--docker-compose.yml3
-rw-r--r--i18n/de.i18n.json4
-rw-r--r--models/settings.js5
-rw-r--r--models/users.js9
-rw-r--r--package-lock.json24
-rw-r--r--package.json4
-rwxr-xr-xreleases/release-sandstorm.sh39
-rw-r--r--sandstorm-pkgdef.capnp5
-rw-r--r--sandstorm.js4
-rw-r--r--server/publications/boards.js2
-rwxr-xr-xsnap-src/bin/config7
-rwxr-xr-xsnap-src/bin/wekan-help3
-rwxr-xr-xstart-wekan.bat7
-rwxr-xr-xstart-wekan.sh3
-rw-r--r--torodb-postgresql/docker-compose.yml5
29 files changed, 159 insertions, 77 deletions
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 00000000..be6e71f5
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,10 @@
+FROM gitpod/workspace-mongodb
+
+USER gitpod
+
+# Install custom tools, runtime, etc. using apt-get
+# For example, the command below would install "bastet" - a command line tetris clone:
+#
+# RUN sudo apt-get -q update && # sudo apt-get install -yq bastet && # sudo rm -rf /var/lib/apt/lists/*
+#
+# More information: https://www.gitpod.io/docs/config-docker/
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 00000000..6463af3b
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,4 @@
+tasks:
+ - init: npm install
+image:
+ file: .gitpod.Dockerfile
diff --git a/.sandstorm-meteor-1.8/package-lock.json b/.sandstorm-meteor-1.8/package-lock.json
index b00234e7..0d73e909 100644
--- a/.sandstorm-meteor-1.8/package-lock.json
+++ b/.sandstorm-meteor-1.8/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "wekan",
- "version": "v3.94.0",
+ "version": "v3.95.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/.sandstorm-meteor-1.8/package.json b/.sandstorm-meteor-1.8/package.json
index 50db4726..4b72c8d4 100644
--- a/.sandstorm-meteor-1.8/package.json
+++ b/.sandstorm-meteor-1.8/package.json
@@ -1,6 +1,6 @@
{
"name": "wekan",
- "version": "v3.94.0",
+ "version": "v3.95.0",
"description": "Open-Source kanban",
"private": true,
"scripts": {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 830fa036..fb99f773 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+# v3.95 2020-04-12 Wekan release
+
+This release adds the following new features:
+
+- [Add gitpod config](https://github.com/wekan/wekan/pull/3009).
+ This adds support for Gitpod.io, a free automated
+ dev environment that makes contributing and generally working on GitHub
+ projects much easier. It allows anyone to start a ready-to-code dev
+ environment for any branch, issue and pull request with a single click.
+ Thanks to juniormendonca.
+- [Public boards overview](https://github.com/wekan/wekan/pull/3008).
+ Thanks to NicoP-S.
+- Try to upgrade Sandstorm Wekan to Meteor 1.10.1 and Node 12.x.
+ Thanks to kentonv and xet7.
+
+and fixes the following bugs:
+
+- [Fix styling issue in notifications drawer](https://github.com/wekan/wekan/pull/3012).
+ Thanks to boeserwolf.
+- [Fix error in notifications cleanup cron](https://github.com/wekan/wekan/pull/3010).
+ Thanks to jtbairdsr.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
# v3.94 2020-04-12 Wekan release
This release adds the following new features:
@@ -103,7 +127,7 @@ and fixes the following bugs:
- [Fix start-wekan.sh MongoDB port to 27017](https://github.com/wekan/wekan/commit/c60a092fc0ed9fe15c417bcb443b1e3e3aaedf7e).
Thanks to Keelan and xet7.
-
+
Thanks to above GitHub users for their contributions and translators for their translations.
# v3.87 2020-04-01 Wekan release
@@ -143,7 +167,7 @@ This release fixes the following bugs:
@member mention not close card, and disabling clicking of
@member mention](https://github.com/wekan/wekan/commit/b9099a8b7ea6f63c79bdcbb871cb993b2cb7e325).
Thanks to xet7 !
-
+
Thanks to above GitHub users for their contributions and translators for their translations.
# v3.85 2020-03-23 Wekan release
diff --git a/Dockerfile b/Dockerfile
index 63002e79..67f7d329 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -113,7 +113,8 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
CORS_EXPOSE_HEADERS="" \
DEFAULT_AUTHENTICATION_METHOD="" \
SCROLLINERTIA="0" \
- SCROLLAMOUNT="auto"
+ SCROLLAMOUNT="auto" \
+ PASSWORD_LOGIN_ENABLED=true
# Copy the app to the image
COPY ${SRC_PATH} /home/wekan/app
diff --git a/README.md b/README.md
index affbf5e8..975fe6e2 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/wekan/wekan)
+
# Wekan - Open Source kanban
[![Contributors](https://img.shields.io/github/contributors/wekan/wekan.svg "Contributors")](https://github.com/wekan/wekan/graphs/contributors)
diff --git a/Stackerfile.yml b/Stackerfile.yml
index ca8eaa5d..77d375e6 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v3.94.0"
+appVersion: "v3.95.0"
files:
userUploads:
- README.md
diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade
index 79bae502..46086693 100644
--- a/client/components/boards/boardsList.jade
+++ b/client/components/boards/boardsList.jade
@@ -39,7 +39,7 @@ template(name="boardList")
i.fa.js-archive-board(
class="fa-archive"
title="{{_ 'archive-board'}}")
- else if currentUser.isBoardAdmin
+ else if isAdministrable
i.fa.js-clone-board(
class="fa-clone"
title="{{_ 'duplicate-board'}}")
@@ -55,7 +55,7 @@ template(name="boardList")
title="{{_ 'archive-board'}}")
template(name="boardListHeaderBar")
- h1 {{_ 'my-boards'}}
+ h1 {{_ title }}
.board-header-btns.right
a.board-header-btn.js-open-archived-board
i.fa.fa-archive
diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js
index 3918af82..65bed16a 100644
--- a/client/components/boards/boardsList.js
+++ b/client/components/boards/boardsList.js
@@ -7,6 +7,9 @@ Template.boardListHeaderBar.events({
});
Template.boardListHeaderBar.helpers({
+ title(){
+ return FlowRouter.getRouteName() == 'home' ? 'my-boards' :'public';
+ },
templatesBoardId() {
return Meteor.user() && Meteor.user().getTemplatesBoardId();
},
@@ -21,12 +24,17 @@ BlazeComponent.extendComponent({
},
boards() {
+ let query = {
+ archived: false,
+ type: 'board',
+ }
+ if (FlowRouter.getRouteName() == 'home')
+ query['members.userId'] = Meteor.userId()
+ else
+ query.permission = 'public'
+
return Boards.find(
- {
- archived: false,
- 'members.userId': Meteor.userId(),
- type: 'board',
- },
+ query,
{ sort: ['title'] },
);
},
@@ -34,6 +42,10 @@ BlazeComponent.extendComponent({
const user = Meteor.user();
return user && user.hasStarred(this.currentData()._id);
},
+ isAdministrable() {
+ const user = Meteor.user();
+ return user && user.isBoardAdmin(this.currentData()._id);
+ },
hasOvertimeCards() {
subManager.subscribe('board', this.currentData()._id, false);
diff --git a/client/components/main/header.jade b/client/components/main/header.jade
index 9a5a6b9b..de7ead93 100644
--- a/client/components/main/header.jade
+++ b/client/components/main/header.jade
@@ -24,6 +24,11 @@ template(name="header")
a(href="{{pathFor 'home'}}")
span.fa.fa-home
| {{_ 'all-boards'}}
+ li.separator -
+ li
+ a(href="{{pathFor 'public'}}")
+ span.fa.fa-globe
+ | {{_ 'public'}}
each currentUser.starredBoards
li.separator -
li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
diff --git a/client/components/main/header.styl b/client/components/main/header.styl
index 632d1535..38ff0560 100644
--- a/client/components/main/header.styl
+++ b/client/components/main/header.styl
@@ -127,7 +127,7 @@
&.current
color: darken(white, 5%)
- &:first-child .fa-home
+ &:first-child .fa-home,&:nth-child(3) .fa-globe
margin-right: 5px
a.js-create-board
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index e5c86d76..83678e73 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -31,6 +31,11 @@ Template.userFormsLayout.onCreated(function() {
return this.stop();
},
});
+ Meteor.call('isPasswordLoginDisabled', (_, result) => {
+ if (result) {
+ $('.at-pwd-form').hide();
+ }
+ });
});
Template.userFormsLayout.onRendered(() => {
diff --git a/config/router.js b/config/router.js
index ad76035b..2e66c67f 100644
--- a/config/router.js
+++ b/config/router.js
@@ -26,6 +26,27 @@ FlowRouter.route('/', {
},
});
+FlowRouter.route('/public', {
+ name: 'public',
+ triggersEnter: [AccountsTemplates.ensureSignedIn],
+ action() {
+ Session.set('currentBoard', null);
+ Session.set('currentList', null);
+ Session.set('currentCard', null);
+
+ Filter.reset();
+ EscapeActions.executeAll();
+
+ Utils.manageCustomUI();
+ Utils.manageMatomo();
+
+ BlazeLayout.render('defaultLayout', {
+ headerBar: 'boardListHeaderBar',
+ content: 'boardList',
+ });
+ },
+});
+
FlowRouter.route('/b/:id/:slug', {
name: 'board',
action(params) {
diff --git a/docker-compose.yml b/docker-compose.yml
index fe037add..071fb5a6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -598,6 +598,9 @@ services:
# example : LOGOUT_ON_MINUTES=55
#- LOGOUT_ON_MINUTES=
#-------------------------------------------------------------------
+ # Hide password login form
+ # - PASSWORD_LOGIN_ENABLED=true
+ #-------------------------------------------------------------------
depends_on:
- wekandb
diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json
index 3a0039eb..a14ac3f9 100644
--- a/i18n/de.i18n.json
+++ b/i18n/de.i18n.json
@@ -328,7 +328,7 @@
"filter-clear": "Filter entfernen",
"filter-no-label": "Kein Label",
"filter-no-member": "Kein Mitglied",
- "filter-no-assignee": "No assignee",
+ "filter-no-assignee": "Nicht zugewiesen",
"filter-no-custom-fields": "Keine benutzerdefinierten Felder",
"filter-show-archive": "Archivierte Listen anzeigen",
"filter-hide-empty": "Leere Listen verstecken",
@@ -772,7 +772,7 @@
"newUserPopup-title": "Neuer Benutzer",
"notifications": "Benachrichtigungen",
"view-all": "Alle anzeigen",
- "filter-by-unread": "Nach Ungelesenen filtern",
+ "filter-by-unread": "Nur ungelesene",
"mark-all-as-read": "Alle als gelesen markieren",
"remove-all-read": "Alle gelesenen entfernen",
"allow-rename": "Umbenennen erlauben",
diff --git a/models/settings.js b/models/settings.js
index 0d671aa4..03ef9052 100644
--- a/models/settings.js
+++ b/models/settings.js
@@ -334,6 +334,11 @@ if (Meteor.isServer) {
getDefaultAuthenticationMethod() {
return process.env.DEFAULT_AUTHENTICATION_METHOD;
},
+
+ isPasswordLoginDisabled() {
+ return process.env.PASSWORD_LOGIN_ENABLED === 'false';
+ },
+
});
}
diff --git a/models/users.js b/models/users.js
index b1f3e26c..a9eeb38b 100644
--- a/models/users.js
+++ b/models/users.js
@@ -377,8 +377,8 @@ if (Meteor.isClient) {
return board && board.hasWorker(this._id);
},
- isBoardAdmin() {
- const board = Boards.findOne(Session.get('currentBoard'));
+ isBoardAdmin(boardId = Session.get('currentBoard')) {
+ const board = Boards.findOne(boardId);
return board && board.hasAdmin(this._id);
},
});
@@ -815,7 +815,7 @@ if (Meteor.isServer) {
user.addInvite(boardId);
//Check if there is a subtasks board
- if (board.subtasksDefaultBoardId){
+ if (board.subtasksDefaultBoardId) {
const subBoard = Boards.findOne(board.subtasksDefaultBoardId);
//If there is, also add user to that board
if (subBoard) {
@@ -823,7 +823,7 @@ if (Meteor.isServer) {
user.addInvite(subBoard._id);
}
}
-
+
try {
const params = {
user: user.username,
@@ -952,6 +952,7 @@ const addCronJob = _.debounce(
schedule: parser => parser.text('every 1 days'),
job: () => {
for (const user of Users.find()) {
+ if (!user.profile || !user.profile.notifications) continue;
for (const notification of user.profile.notifications) {
if (notification.read) {
const removeDate = new Date(notification.read);
diff --git a/package-lock.json b/package-lock.json
index 7871cacb..ca055733 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "wekan",
- "version": "v3.94.0",
+ "version": "v3.95.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -25,11 +25,11 @@
}
},
"@babel/runtime": {
- "version": "7.8.4",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz",
- "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==",
+ "version": "7.9.2",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
+ "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
"requires": {
- "regenerator-runtime": "^0.13.2"
+ "regenerator-runtime": "^0.13.4"
}
},
"@samverschueren/stream-to-observable": {
@@ -3149,11 +3149,11 @@
}
},
"mkdirp": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
- "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+ "version": "0.5.5",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+ "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
"requires": {
- "minimist": "1.2.5"
+ "minimist": "^1.2.5"
}
},
"moment": {
@@ -3882,9 +3882,9 @@
}
},
"regenerator-runtime": {
- "version": "0.13.3",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
- "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
+ "version": "0.13.5",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+ "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
},
"regex-not": {
"version": "1.0.2",
diff --git a/package.json b/package.json
index 0ed67b3c..b03e7d3f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wekan",
- "version": "v3.94.0",
+ "version": "v3.95.0",
"description": "Open-Source kanban",
"private": true,
"scripts": {
@@ -53,7 +53,7 @@
"prettier-eslint": "^9.0.1"
},
"dependencies": {
- "@babel/runtime": "^7.8.4",
+ "@babel/runtime": "^7.9.2",
"ajv": "^5.0.0",
"babel-runtime": "^6.26.0",
"bcrypt": "^3.0.7",
diff --git a/releases/release-sandstorm.sh b/releases/release-sandstorm.sh
index 997e46c4..9bf32bf5 100755
--- a/releases/release-sandstorm.sh
+++ b/releases/release-sandstorm.sh
@@ -1,4 +1,4 @@
-# Usage: ./release.sh 1.36
+# Usage: ./release.sh 3.95
# Delete old stuff
#cd ~/repos/wekan
@@ -10,8 +10,6 @@
REPODIR=/home/wekan/repos
WEKANDIR=/home/wekan/repos/wekan
-OLDDIR=/home/wekan/repos/sandstorm-build
-METEDIR=/home/wekan/repos/wekan/.sandstorm-meteor-1.8
# Ensure sudo access
sudo echo .
@@ -20,45 +18,14 @@ cd $REPODIR
rm -rf $WEKANDIR
git clone git@github.com:wekan/wekan.git
cd $WEKANDIR
-# Use Meteor 1.8.x and Node 8.17.0
-sudo n 8.17.0
-#sudo rm -rf /root/.cache/node-gyp/8.17.0
+sudo n 12.16.2
sudo mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp
-#sudo npm -g uninstall node-gyp node-pre-gyp fibers
-#./releases/rebuild-release.sh
-rm -rf $OLDDIR
-mkdir $OLDDIR
-mv .meteor $OLDDIR/
-cp -pR .snap-meteor-1.8 $OLDDIR/
-mv $METEDIR/.meteor .
-mv $METEDIR/package.json .
-mv $METEDIR/package-lock.json .
-# Meteor 1.9.x has changes to Buffer() => Buffer.alloc(), so reverting those
-mv $METEDIR/cfs_access-point.txt fix-download-unicode/
-mv $METEDIR/export.js models/
-mv $METEDIR/wekanCreator.js models/
-mv $METEDIR/ldap.js packages/wekan-ldap/server/ldap.js
-mv $METEDIR/oidc_server.js packages/wekan-oidc/oidc_server.js
-rm -rf $METEDIR
# Build Wekan
./releases/rebuild-release.sh
-# Build bundle with Meteor 1.8.x and Node 8.17.0
cd .build/bundle/programs/server
-npm install node-gyp node-pre-gyp fibers@2.0.0
+npm install node-gyp node-pre-gyp fibers
cd $WEKANDIR
# Build Sandstorm
meteor-spk pack wekan-$1.spk
#spk publish wekan-$1.spk
#scp wekan-$1.spk x2:/var/snap/wekan/common/releases.wekan.team/
-#mv wekan-$1.spk ..
-#sudo rm -rf .meteor-spk
-# Back to Meteor 1.9 and Node 12.14.1
-#sudo n 12.14.1
-#sudo rm -rf .meteor
-#mv ../sandstorm-build/.meteor .
-#mv ../sandstorm-build/.snap-meteor-1.8 .
-#rmdir ../sandstorm-build
-# Delete old stuff
-#cd ~/repos/wekan
-#./releases/release-cleanup.sh
-
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 18124e31..0b2f1c36 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
appTitle = (defaultText = "Wekan"),
# The name of the app as it is displayed to the user.
- appVersion = 394,
+ appVersion = 395,
# Increment this for every release.
- appMarketingVersion = (defaultText = "3.94.0~2020-04-12"),
+ appMarketingVersion = (defaultText = "3.95.0~2020-04-12"),
# Human-readable presentation of the app version.
minUpgradableAppVersion = 0,
@@ -259,6 +259,7 @@ const myCommand :Spk.Manifest.Command = (
(key = "OAUTH2_USERINFO_ENDPOINT", value=""),
(key = "OAUTH2_TOKEN_ENDPOINT", value=""),
(key = "LDAP_ENABLE", value="false"),
+ (key = "PASSWORD_LOGIN_ENABLED", value="true"),
(key = "SANDSTORM", value="1"),
(key = "METEOR_SETTINGS", value = "{\"public\": {\"sandstorm\": true}}")
]
diff --git a/sandstorm.js b/sandstorm.js
index 590a24ec..8615e419 100644
--- a/sandstorm.js
+++ b/sandstorm.js
@@ -22,9 +22,7 @@ const sandstormBoard = {
if (isSandstorm && Meteor.isServer) {
const fs = require('fs');
- const pathParts = process.cwd().split('/');
- const path = pathParts.join('/');
- const Capnp = Npm.require(`${path}../../../node_modules/capnp.js`);
+ const Capnp = Npm.require(`capnp`);
const Package = Capnp.importSystem('sandstorm/package.capnp');
const Powerbox = Capnp.importSystem('sandstorm/powerbox.capnp');
const Identity = Capnp.importSystem('sandstorm/identity.capnp');
diff --git a/server/publications/boards.js b/server/publications/boards.js
index f24dce47..6fbd9860 100644
--- a/server/publications/boards.js
+++ b/server/publications/boards.js
@@ -18,7 +18,7 @@ Meteor.publish('boards', function() {
archived: false,
$or: [
{
- _id: { $in: starredBoards },
+ // _id: { $in: starredBoards }, // Commented out, to get a list of all public boards
permission: 'public',
},
{ members: { $elemMatch: { userId, isActive: true } } },
diff --git a/snap-src/bin/config b/snap-src/bin/config
index 90c70c91..48ab6393 100755
--- a/snap-src/bin/config
+++ b/snap-src/bin/config
@@ -3,7 +3,7 @@
# All supported keys are defined here together with descriptions and default values
# list of supported keys
-keys="DEBUG MONGO_URL MONGODB_BIND_UNIX_SOCKET MONGO_URL MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API RICHER_CARD_COMMENT_EDITOR CARD_OPENED_WEBHOOK_ENABLED ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW MAX_IMAGE_PIXEL IMAGE_COMPRESS_RATIO BIGEVENTS_PATTERN NOTIFICATION_TRAY_AFTER_READ_DAYS_BEFORE_REMOVE NOTIFY_DUE_DAYS_BEFORE_AND_AFTER NOTIFY_DUE_AT_HOUR_OF_DAY EMAIL_NOTIFICATION_TIMEOUT CORS CORS_ALLOW_HEADERS CORS_EXPOSE_HEADERS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_ID_TOKEN_WHITELIST_FIELDS OAUTH2_EMAIL_MAP OAUTH2_REQUEST_PERMISSIONS LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_AUTHENTICATION LDAP_USER_AUTHENTICATION_FIELD LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD ATTACHMENTS_STORE_PATH SCROLLINERTIA SCROLLAMOUNT"
+keys="DEBUG MONGO_URL MONGODB_BIND_UNIX_SOCKET MONGO_URL MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API RICHER_CARD_COMMENT_EDITOR CARD_OPENED_WEBHOOK_ENABLED ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW MAX_IMAGE_PIXEL IMAGE_COMPRESS_RATIO BIGEVENTS_PATTERN NOTIFICATION_TRAY_AFTER_READ_DAYS_BEFORE_REMOVE NOTIFY_DUE_DAYS_BEFORE_AND_AFTER NOTIFY_DUE_AT_HOUR_OF_DAY EMAIL_NOTIFICATION_TIMEOUT CORS CORS_ALLOW_HEADERS CORS_EXPOSE_HEADERS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_ID_TOKEN_WHITELIST_FIELDS OAUTH2_EMAIL_MAP OAUTH2_REQUEST_PERMISSIONS LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_AUTHENTICATION LDAP_USER_AUTHENTICATION_FIELD LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD ATTACHMENTS_STORE_PATH SCROLLINERTIA SCROLLAMOUNT PASSWORD_LOGIN_ENABLED"
# default values
DESCRIPTION_DEBUG="Debug OIDC OAuth2 etc. Example: sudo snap set wekan debug='true'"
@@ -461,3 +461,8 @@ KEY_SCROLLINERTIA="scrollinertia"
DESCRIPTION_SCROLLINERTIA="Mousewheel scroll amount, issue #2949. Default: 'auto'"
DEFAULT_SCROLLINERTIA="auto"
KEY_SCROLLINERTIA="scrollamount"
+
+DESCRIPTION_PASSWORD_LOGIN_ENABLED="To hide the password login form"
+DEFAULT_PASSWORD_LOGIN_ENABLED="true"
+KEY_PASSWORD_LOGIN_ENABLED="password-login-enabled"
+
diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help
index 008a4de1..dfcf40a5 100755
--- a/snap-src/bin/wekan-help
+++ b/snap-src/bin/wekan-help
@@ -461,6 +461,9 @@ echo -e "Default authentication method."
echo -e "The default authentication method used if a user does not exist to create and authenticate. Method can be password or ldap."
echo -e "\t$ snap set $SNAP_NAME default-authentication-method='ldap'"
echo -e "\n"
+echo -e "Enable or not password login Form"
+echo -e "\t$ snap set $SNAP_NAME password-login-enabled='false'"
+echo -e "\n"
# parse config file for supported settings keys
echo -e "wekan supports settings keys"
echo -e "values can be changed by calling\n$ snap set $SNAP_NAME <key name>='<key value>'"
diff --git a/start-wekan.bat b/start-wekan.bat
index 61c242ee..272e963e 100755
--- a/start-wekan.bat
+++ b/start-wekan.bat
@@ -363,6 +363,13 @@ REM SET LDAP_SYNC_ADMIN_STATUS=true
REM # Comma separated list of admin group names to sync.
REM SET LDAP_SYNC_ADMIN_GROUPS=group1,group2
+REM ------------------------------------------------
+
+REM # Enable/Disable password login form.
+REM SET PASSWORD_LOGIN_ENABLED=true
+
+REM ------------------------------------------------
+
REM # Login to LDAP automatically with HTTP header.
REM # In below example for siteminder, at right side of = is header name.
REM SET HEADER_LOGIN_ID=HEADERUID
diff --git a/start-wekan.sh b/start-wekan.sh
index bf598e39..f3fb18e9 100755
--- a/start-wekan.sh
+++ b/start-wekan.sh
@@ -362,6 +362,9 @@
# LOGOUT_ON_MINUTES : The number of minutes
# example : LOGOUT_ON_MINUTES=55
#export LOGOUT_ON_MINUTES=
+ #---------------------------------------------------------------------
+ # PASSWORD_LOGIN_ENABLED : Enable or not the password login form.
+ #export PASSWORD_LOGIN_ENABLED=true
node main.js
# & >> ../../wekan.log
diff --git a/torodb-postgresql/docker-compose.yml b/torodb-postgresql/docker-compose.yml
index e742402f..793a9b4f 100644
--- a/torodb-postgresql/docker-compose.yml
+++ b/torodb-postgresql/docker-compose.yml
@@ -527,7 +527,12 @@ services:
# LOGOUT_ON_MINUTES : The number of minutes
# example : LOGOUT_ON_MINUTES=55
#- LOGOUT_ON_MINUTES=
+ #---------------------------------------------------------------------
+ # PASSWORD_LOGIN_ENABLED : Enable or not the password login form.
+ # example: PASSWORD_LOGIN_ENABLED=false
+ # - PASSWORD_LOGIN_ENABLED
#-------------------------------------------------------------------
+
depends_on:
- mongodb