diff options
| -rw-r--r-- | .devcontainer/Dockerfile | 3 | ||||
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | client/components/lists/listBody.jade | 7 | ||||
| -rw-r--r-- | client/components/lists/listBody.js | 6 | ||||
| -rw-r--r-- | docker-compose.yml | 3 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 1 | ||||
| -rw-r--r-- | server/publications/cards.js | 21 | ||||
| -rwxr-xr-x | snap-src/bin/config | 6 | ||||
| -rwxr-xr-x | snap-src/bin/wekan-help | 4 | ||||
| -rwxr-xr-x | start-wekan.bat | 4 | ||||
| -rwxr-xr-x | start-wekan.sh | 4 | ||||
| -rw-r--r-- | torodb-postgresql/docker-compose.yml | 3 |
13 files changed, 10 insertions, 59 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 9a599e86..fa17ff1f 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -108,8 +108,7 @@ ENV \ CORS="" \ CORS_ALLOW_HEADERS="" \ CORS_EXPOSE_HEADERS="" \ - DEFAULT_AUTHENTICATION_METHOD="" \ - LINKED_CARDS_ENABLED=true + DEFAULT_AUTHENTICATION_METHOD="" # Install OS RUN set -o xtrace \ diff --git a/CHANGELOG.md b/CHANGELOG.md index c21698e2..b9b18722 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,6 @@ This release adds the following features: - [Allow card & checklist API creation for authorized board members](https://github.com/wekan/wekan/pull/2854). Thanks to Robert-Lebedeu. -- [Add env var LINKED_CARDS_ENABLED to enable or not linked cards. It is set at true by default](https://github.com/wekan/wekan/pull/2834). - Thanks to Akuket. -- [LINKED_CARDS_ENABLED settings part 2](https://github.com/wekan/wekan/commit/1bf7f95bd8e1f38ad0413861c32dce3b0edb407e). - Thanks to xet7. - [Visual difference for inactive user in Administration: strikethrough](https://github.com/wekan/wekan/commit/1f1aea87a421ca5e7931d220d10c838574208e2c). Thanks to hever and xet7. @@ -110,8 +110,7 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build- CORS="" \ CORS_ALLOW_HEADERS="" \ CORS_EXPOSE_HEADERS="" \ - DEFAULT_AUTHENTICATION_METHOD="" \ - LINKED_CARDS_ENABLED=true + DEFAULT_AUTHENTICATION_METHOD="" # Copy the app to the image COPY ${SRC_PATH} /home/wekan/app diff --git a/client/components/lists/listBody.jade b/client/components/lists/listBody.jade index 335e42cd..2f175205 100644 --- a/client/components/lists/listBody.jade +++ b/client/components/lists/listBody.jade @@ -49,10 +49,9 @@ template(name="addCardForm") button.primary.confirm(type="submit") {{_ 'add'}} unless currentBoard.isTemplatesBoard unless currentBoard.isTemplateBoard - if linkedCardsEnabled - span.quiet - | {{_ 'or'}} - a.js-link {{_ 'link'}} + span.quiet + | {{_ 'or'}} + a.js-link {{_ 'link'}} span.quiet | | / diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js index 2851b69a..b0974705 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -377,12 +377,6 @@ BlazeComponent.extendComponent({ }, }).register('addCardForm'); -Template.addCardForm.helpers({ - linkedCardsEnabled() { - return Meteor.settings.public.linkedCardsEnabled; - }, -}); - BlazeComponent.extendComponent({ onCreated() { this.selectedBoardId = new ReactiveVar(''); diff --git a/docker-compose.yml b/docker-compose.yml index d495bf97..b33bda24 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -559,9 +559,6 @@ services: # example : LOGOUT_ON_MINUTES=55 #- LOGOUT_ON_MINUTES= #------------------------------------------------------------------- - # LINKED_CARDS_ENABLED : Enable or not the linked cards feature - # Default: true - #- LINKED_CARDS_ENABLED=false depends_on: - wekandb diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index c7d78410..2f9a0020 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -256,7 +256,6 @@ const myCommand :Spk.Manifest.Command = ( (key = "OAUTH2_USERINFO_ENDPOINT", value=""), (key = "OAUTH2_TOKEN_ENDPOINT", value=""), (key = "LDAP_ENABLE", value="false"), - (key = "LINKED_CARDS_ENABLED", value="true"), (key = "SANDSTORM", value="1"), (key = "METEOR_SETTINGS", value = "{\"public\": {\"sandstorm\": true}}") ] diff --git a/server/publications/cards.js b/server/publications/cards.js index f850ccfe..61210ce5 100644 --- a/server/publications/cards.js +++ b/server/publications/cards.js @@ -1,17 +1,4 @@ -if (process.env.LINKED_CARDS_ENABLED === 'false') { - Meteor.settings.public.linkedCardsEnabled = 'false'; - //Meteor.publish('card', cardId => { - // check(cardId, String); - // // TODO: test - // return Cards.find({ - // _id: cardId, - // linkedId: { $ne: [null, ''] }, - // }); - //}); -} else { - Meteor.settings.public.linkedCardsEnabled = 'true'; - Meteor.publish('card', cardId => { - check(cardId, String); - return Cards.find({ _id: cardId }); - }); -} +Meteor.publish('card', cardId => { + check(cardId, String); + return Cards.find({ _id: cardId }); +}); diff --git a/snap-src/bin/config b/snap-src/bin/config index d19f19b7..8f1bfabd 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 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 LINKED_CARDS_ENABLED" +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 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" # default values DESCRIPTION_DEBUG="Debug OIDC OAuth2 etc. Example: sudo snap set wekan debug='true'" @@ -449,7 +449,3 @@ KEY_LOGOUT_ON_MINUTES="logout-on-minutes" DESCRIPTION_DEFAULT_AUTHENTICATION_METHOD="The default authentication method used if a user does not exist to create and authenticate. Method can be password or ldap." DEFAULT_DEFAULT_AUTHENTICATION_METHOD="" KEY_DEFAULT_AUTHENTICATION_METHOD="default-authentication-method" - -DESCRIPTION_LINKED_CARDS_ENABLED="Enable or not the linked cards feature" -DEFAULT_LINKED_CARDS_ENABLED="true" -KEY_LINKED_CARDS_ENABLED="linked-cards-enabled" diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help index 42fd6f21..1dc952b2 100755 --- a/snap-src/bin/wekan-help +++ b/snap-src/bin/wekan-help @@ -444,10 +444,6 @@ 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 "Linked cards enabled." -echo -e "Enable or not the linked cards feature. Default: true" -echo -e "\t$ snap set $SNAP_NAME linked-cards-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 9bcab655..55dace87 100755 --- a/start-wekan.bat +++ b/start-wekan.bat @@ -378,10 +378,6 @@ REM # LOGOUT_ON_MINUTES : The number of minutes REM # example : LOGOUT_ON_MINUTES=55 REM SET LOGOUT_ON_MINUTES= -REM # LINKED_CARDS_ENABLED : Enable or not the linked cards feature -REM # Default: true -REM SET LINKED_CARDS_ENABLED=false - cd .build\bundle node main.js cd ..\.. diff --git a/start-wekan.sh b/start-wekan.sh index 87c41f2c..ad17f2fb 100755 --- a/start-wekan.sh +++ b/start-wekan.sh @@ -352,10 +352,6 @@ # LOGOUT_ON_MINUTES : The number of minutes # example : LOGOUT_ON_MINUTES=55 #export LOGOUT_ON_MINUTES= - #------------------------------------------------------------------- - # LINKED_CARDS_ENABLED : Enable or not the linked cards feature - # Default: true - #export LINKED_CARDS_ENABLED=false node main.js # & >> ../../wekan.log diff --git a/torodb-postgresql/docker-compose.yml b/torodb-postgresql/docker-compose.yml index 12b8287d..7a7ad9c8 100644 --- a/torodb-postgresql/docker-compose.yml +++ b/torodb-postgresql/docker-compose.yml @@ -518,9 +518,6 @@ services: # example : LOGOUT_ON_MINUTES=55 #- LOGOUT_ON_MINUTES= #------------------------------------------------------------------- - # LINKED_CARDS_ENABLED : Enable or not the linked cards feature - # Default: true - #- LINKED_CARDS_ENABLED=false depends_on: - mongodb |