summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md22
-rw-r--r--Dockerfile4
-rw-r--r--README.md7
-rw-r--r--Stackerfile.yml2
-rw-r--r--client/components/main/header.jade9
-rw-r--r--client/components/main/layouts.jade24
-rw-r--r--client/components/settings/settingBody.jade6
-rw-r--r--client/components/settings/settingBody.styl4
-rw-r--r--client/lib/popup.js2
-rw-r--r--docker-compose.yml193
-rw-r--r--i18n/ar.i18n.json3
-rw-r--r--i18n/bg.i18n.json3
-rw-r--r--i18n/br.i18n.json3
-rw-r--r--i18n/ca.i18n.json3
-rw-r--r--i18n/cs.i18n.json3
-rw-r--r--i18n/da.i18n.json3
-rw-r--r--i18n/de.i18n.json3
-rw-r--r--i18n/el.i18n.json3
-rw-r--r--i18n/en-GB.i18n.json3
-rw-r--r--i18n/en.i18n.json3
-rw-r--r--i18n/eo.i18n.json3
-rw-r--r--i18n/es-AR.i18n.json3
-rw-r--r--i18n/es.i18n.json11
-rw-r--r--i18n/eu.i18n.json3
-rw-r--r--i18n/fa.i18n.json3
-rw-r--r--i18n/fi.i18n.json3
-rw-r--r--i18n/fr.i18n.json3
-rw-r--r--i18n/gl.i18n.json3
-rw-r--r--i18n/he.i18n.json21
-rw-r--r--i18n/hi.i18n.json3
-rw-r--r--i18n/hu.i18n.json3
-rw-r--r--i18n/hy.i18n.json3
-rw-r--r--i18n/id.i18n.json3
-rw-r--r--i18n/ig.i18n.json3
-rw-r--r--i18n/it.i18n.json73
-rw-r--r--i18n/ja.i18n.json3
-rw-r--r--i18n/ka.i18n.json3
-rw-r--r--i18n/km.i18n.json3
-rw-r--r--i18n/ko.i18n.json3
-rw-r--r--i18n/lv.i18n.json3
-rw-r--r--i18n/mk.i18n.json3
-rw-r--r--i18n/mn.i18n.json3
-rw-r--r--i18n/nb.i18n.json3
-rw-r--r--i18n/nl.i18n.json3
-rw-r--r--i18n/oc.i18n.json21
-rw-r--r--i18n/pl.i18n.json3
-rw-r--r--i18n/pt-BR.i18n.json7
-rw-r--r--i18n/pt.i18n.json3
-rw-r--r--i18n/ro.i18n.json3
-rw-r--r--i18n/ru.i18n.json3
-rw-r--r--i18n/sr.i18n.json3
-rw-r--r--i18n/sv.i18n.json3
-rw-r--r--i18n/sw.i18n.json3
-rw-r--r--i18n/ta.i18n.json3
-rw-r--r--i18n/th.i18n.json3
-rw-r--r--i18n/tr.i18n.json3
-rw-r--r--i18n/uk.i18n.json3
-rw-r--r--i18n/vi.i18n.json3
-rw-r--r--i18n/zh-CN.i18n.json57
-rw-r--r--i18n/zh-TW.i18n.json3
-rw-r--r--models/settings.js2
-rw-r--r--openapi/README.md2
-rw-r--r--package.json2
-rw-r--r--public/favicon.png (renamed from public/wekan-favicon.png)bin756 -> 756 bytes
-rw-r--r--public/logo-150.png (renamed from public/wekan-150.png)bin3634 -> 3634 bytes
-rw-r--r--public/logo-150.svg (renamed from public/wekan-150.svg)0
-rw-r--r--public/logo-header.png (renamed from public/wekan-logo-header.png)bin1827 -> 1827 bytes
-rw-r--r--public/logo.png (renamed from public/wekan-logo.png)bin10342 -> 10342 bytes
-rw-r--r--public/manifest.json (renamed from public/wekan-manifest.json)10
-rw-r--r--public/old-logo.png (renamed from public/old-wekan-logo.png)bin8433 -> 8433 bytes
-rw-r--r--rebuild-wekan.bat3
-rwxr-xr-xreleases/rebuild-wekan.sh5
-rwxr-xr-xreleases/virtualbox/start-wekan.sh8
-rw-r--r--sandstorm-pkgdef.capnp4
-rw-r--r--server/authentication.js2
-rw-r--r--server/rulesHelper.js12
-rwxr-xr-xsnap-src/bin/config6
-rwxr-xr-xsnap-src/bin/wekan-help6
-rw-r--r--snapcraft.yaml2
-rwxr-xr-xstart-wekan.bat7
-rwxr-xr-xstart-wekan.sh9
81 files changed, 374 insertions, 301 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8ef7a9d..cc1307b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+# v2.52 2019-03-22 Wekan release
+
+This release adds the following new features:
+
+- [More whitelabeling: Hide Wekan logo and title by default, and don't show separate option to hide logo at
+ Admin Panel/Layout](https://github.com/wekan/wekan/commit/2969161afbe60a1aa2e7da6cedc3ab48941faf3e).
+ Thanks to xet7.
+- Added and then reverted option to redirect OIDC OAuth2 login [part1](https://github.com/wekan/wekan-ldap/commit/82a894ac20ba9e7c6fdf053cff1721cab709bf8a),
+ [part 2](https://github.com/wekan/wekan-ldap/commit/36900cc360d0d406f8fba5e43378f85c92747870) and
+ [part3](https://github.com/wekan/wekan/commit/7919ae362866c0cacf2a486bf91b12e4d25807d7).
+ This does not work yet. In Progress.
+ Thanks to xet7.
+- [Add LDAP config example, remove extra text](https://github.com/wekan/wekan/commit/506acda70b5e78737c52455e5eee9c8758243196).
+ Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fix IFTTT email sending](https://github.com/wekan/wekan/pull/2279).
+ Thanks to justinr1234.
+
+Thanks to above GitHub users for their contributions.
+
# v2.51 2019-03-21 Wekan release
This release fixes the following bugs:
diff --git a/Dockerfile b/Dockerfile
index 326b8101..5f89a998 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,6 +27,7 @@ ARG BROWSER_POLICY_ENABLED
ARG TRUSTED_URL
ARG WEBHOOKS_ATTRIBUTES
ARG OAUTH2_ENABLED
+ARG OAUTH2_LOGIN_STYLE
ARG OAUTH2_CLIENT_ID
ARG OAUTH2_SECRET
ARG OAUTH2_SERVER_URL
@@ -123,6 +124,7 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
TRUSTED_URL="" \
WEBHOOKS_ATTRIBUTES="" \
OAUTH2_ENABLED=false \
+ OAUTH2_LOGIN_STYLE=redirect \
OAUTH2_CLIENT_ID="" \
OAUTH2_SECRET="" \
OAUTH2_SERVER_URL="" \
@@ -310,7 +312,7 @@ RUN \
cd /home/wekan/app &&\
mkdir -p ./public/api && \
python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml && \
- /opt/nodejs/bin/api2html -c ./public/wekan-logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml; \
+ /opt/nodejs/bin/api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml; \
# Build app
cd /home/wekan/app && \
gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \
diff --git a/README.md b/README.md
index cee7f49d..075cda82 100644
--- a/README.md
+++ b/README.md
@@ -22,9 +22,8 @@ It's better than at chat where details get lost when chat scrolls up.
## Chat
-[![Wekan Vanila Chat][vanila_badge]][vanila_chat] - Most Wekan community and developers are here at #wekan chat channel.
-Use webbrowser to register, and after that you can also alternatively use mobile app Rocket.Chat by Rocket.Chat with
-address https://chat.vanila.io and same username and password.
+[![Wekan Chat][vanila_badge]][wekan_chat] - Most Wekan community and developers are here. Works on webbrowser
+and PWA app that can be added as icon on Android and bookmark on iOS, used like native app.
[Wekan IRC FAQ](https://github.com/wekan/wekan/wiki/IRC-FAQ)
@@ -133,4 +132,4 @@ with [Meteor](https://www.meteor.com).
[open_source]: https://en.wikipedia.org/wiki/Open-source_software
[free_software]: https://en.wikipedia.org/wiki/Free_software
[vanila_badge]: https://vanila.io/img/join-chat-button2.png
-[vanila_chat]: https://chat.vanila.io/channel/wekan
+[wekan_chat]: https://community.vanila.io/wekan
diff --git a/Stackerfile.yml b/Stackerfile.yml
index ac51f599..96654cca 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.51.0"
+appVersion: "v2.52.0"
files:
userUploads:
- README.md
diff --git a/client/components/main/header.jade b/client/components/main/header.jade
index c0781303..75e84c0c 100644
--- a/client/components/main/header.jade
+++ b/client/components/main/header.jade
@@ -45,15 +45,16 @@ template(name="header")
#header-main-bar(class="{{#if wrappedHeader}}wrapper{{/if}}")
+Template.dynamic(template=headerBar)
- unless hideLogo
+ //unless hideLogo
//-
On sandstorm, the logo shouldn't be clickable, because we only have one
page/document on it, and we don't want to see the home page containing
the list of all boards.
- unless currentSetting.hideLogo
- a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
- img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan")
+
+ // unless currentSetting.hideLogo
+ // a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
+ // img(src="{{pathFor '/logo-header.png'}}" alt="")
if appIsOffline
+offlineWarning
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index 3be676a3..9908f12e 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -1,5 +1,5 @@
head
- title Wekan
+ title
meta(name="viewport"
content="maximum-scale=1.0,width=device-width,initial-scale=1.0,user-scalable=0")
meta(http-equiv="X-UA-Compatible" content="IE=edge")
@@ -7,20 +7,20 @@ head
where the application is deployed with a path prefix, but it seems to be
difficult to do that cleanly with Blaze -- at least without adding extra
packages.
- link(rel="shortcut icon" href="/wekan-favicon.png")
- link(rel="apple-touch-icon" href="/wekan-favicon.png")
- link(rel="mask-icon" href="/wekan-150.svg")
- link(rel="manifest" href="/wekan-manifest.json")
+ link(rel="shortcut icon" href="/favicon.png")
+ link(rel="apple-touch-icon" href="/favicon.png")
+ link(rel="mask-icon" href="/logo-150.svg")
+ link(rel="manifest" href="/manifest.json")
template(name="userFormsLayout")
section.auth-layout
- if currentSetting.hideLogo
- h1
- br
- br
- else
- h1.at-form-landing-logo
- img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
+ //if currentSetting.hideLogo
+ h1
+ br
+ br
+ //else
+ // h1.at-form-landing-logo
+ // img(src="{{pathFor '/logo.png'}}" alt="")
section.auth-dialog
+Template.dynamic(template=content)
if currentSetting.displayAuthenticationMethod
diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade
index 220dbb50..89911e09 100644
--- a/client/components/settings/settingBody.jade
+++ b/client/components/settings/settingBody.jade
@@ -134,7 +134,7 @@ template(name='announcementSettings')
template(name='layoutSettings')
ul#layout-setting.setting-detail
- li.layout-form
+ //li.layout-form
.title {{_ 'hide-logo'}}
.form-group.flex
input.form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}")
@@ -154,7 +154,7 @@ template(name='layoutSettings')
li.layout-form
.title {{_ 'custom-product-name'}}
.form-group
- input.form-control#product-name(type="text", placeholder="Wekan" value="{{currentSetting.productName}}")
+ input.form-control#product-name(type="text", placeholder="" value="{{currentSetting.productName}}")
li.layout-form
.title {{_ 'add-custom-html-after-body-start'}}
textarea#customHTMLafterBodyStart.form-control= currentSetting.customHTMLafterBodyStart
@@ -171,4 +171,4 @@ template(name='selectAuthenticationMethod')
if isSelected value
option(value="{{value}}" selected) {{_ value}}
else
- option(value="{{value}}") {{_ value}} \ No newline at end of file
+ option(value="{{value}}") {{_ value}}
diff --git a/client/components/settings/settingBody.styl b/client/components/settings/settingBody.styl
index 7f8bd4c0..dbf91a6c 100644
--- a/client/components/settings/settingBody.styl
+++ b/client/components/settings/settingBody.styl
@@ -52,6 +52,10 @@
.main-body
padding: 0.1em 1em
+ -webkit-user-select: auto // Safari 3.1+
+ -moz-user-select: auto // Firefox 2+
+ -ms-user-select: auto // IE 10+
+ user-select: auto // Standard syntax
ul
li
diff --git a/client/lib/popup.js b/client/lib/popup.js
index 5b640f50..9abe48aa 100644
--- a/client/lib/popup.js
+++ b/client/lib/popup.js
@@ -184,7 +184,7 @@ window.Popup = new class {
// positives.
const title = TAPi18n.__(translationKey);
// when popup showed as full of small screen, we need a default header to clearly see [X] button
- const defaultTitle = Utils.isMiniScreen() ? 'Wekan' : false;
+ const defaultTitle = Utils.isMiniScreen() ? '' : false;
return title !== translationKey ? title : defaultTitle;
};
}
diff --git a/docker-compose.yml b/docker-compose.yml
index ef1580aa..b8089e20 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -90,11 +90,11 @@ services:
wekandb:
#-------------------------------------------------------------------------------------
# ==== MONGODB AND METEOR VERSION ====
- # a) CURRENTLY BROKEN: For Wekan Meteor 1.8.x version at meteor-1.8 branch, use mongo 4.x
- # image: mongo:4.0.4
+ # a) For Wekan Meteor 1.8.x version at meteor-1.8 branch, use mongo 4.x
+ image: mongo:4.0.4
# b) For Wekan Meteor 1.6.x version at master/devel/edge branches.
# Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x
- image: mongo:3.2.21
+ #image: mongo:3.2.21
#-------------------------------------------------------------------------------------
container_name: wekan-db
restart: always
@@ -110,12 +110,12 @@ services:
wekan:
#-------------------------------------------------------------------------------------
# ==== MONGODB AND METEOR VERSION ====
- # a) CURRENTLY BROKEN: For Wekan Meteor 1.8.x version at meteor-1.8 branch,
+ # a) For Wekan Meteor 1.8.x version at meteor-1.8 branch,
# using https://quay.io/wekan/wekan automatic builds
- # image: quay.io/wekan/wekan:meteor-1.8
+ image: quay.io/wekan/wekan:meteor-1.8
# b) For Wekan Meteor 1.6.x version at master/devel/edge branches.
# Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x
- image: quay.io/wekan/wekan
+ #image: quay.io/wekan/wekan
# c) Using specific Meteor 1.6.x version tag:
# image: quay.io/wekan/wekan:v1.95
# c) Using Docker Hub automatic builds https://hub.docker.com/r/wekanteam/wekan
@@ -169,8 +169,9 @@ services:
# For SSL in email, change smtp:// to smtps://
# NOTE: Special characters need to be url-encoded in MAIL_URL.
# You can encode those characters for example at: https://www.urlencoder.org
- - MAIL_URL=smtp://user:pass@mailserver.example.com:25/
- - MAIL_FROM='Example Wekan Support <support@example.com>'
+ #- MAIL_URL=smtp://user:pass@mailserver.example.com:25/
+ - MAIL_URL='smtp://<mail_url>:25/?ignoreTLS=true&tls={rejectUnauthorized:false}'
+ - MAIL_FROM='Wekan Notifications <noreply.wekan@mydomain.com>'
#---------------------------------------------------------------
# ==== OPTIONAL: MONGO OPLOG SETTINGS =====
# https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-378343587
@@ -272,6 +273,8 @@ services:
# 2) Configure the environment variables. This differs slightly
# by installation type, but make sure you have the following:
#- OAUTH2_ENABLED=true
+ # OAuth2 login style: popup or redirect.
+ #- OAUTH2_LOGIN_STYLE=redirect
# Application GUID captured during app registration:
#- OAUTH2_CLIENT_ID=xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx
# Secret key generated during app registration:
@@ -292,6 +295,8 @@ services:
# ==== OAUTH2 KEYCLOAK ====
# https://github.com/wekan/wekan/wiki/Keycloak <== MAPPING INFO, REQUIRED
#- OAUTH2_ENABLED=true
+ # OAuth2 login style: popup or redirect.
+ #- OAUTH2_LOGIN_STYLE=redirect
#- OAUTH2_CLIENT_ID=<Keycloak create Client ID>
#- OAUTH2_SERVER_URL=<Keycloak server name>/auth
#- OAUTH2_AUTH_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/auth
@@ -305,6 +310,8 @@ services:
# Enable the OAuth2 connection
#- OAUTH2_ENABLED=true
# OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
+ # OAuth2 login style: popup or redirect.
+ #- OAUTH2_LOGIN_STYLE=redirect
# OAuth2 Client ID.
#- OAUTH2_CLIENT_ID=abcde12345
# OAuth2 Secret.
@@ -326,191 +333,137 @@ services:
# OAuth2 Email Mapping
#- OAUTH2_EMAIL_MAP=
#-----------------------------------------------------------------
- # ==== LDAP ====
+ # ==== LDAP: UNCOMMENT ALL TO ENABLE LDAP ====
# https://github.com/wekan/wekan/wiki/LDAP
# For Snap settings see https://github.com/wekan/wekan-snap/wiki/Supported-settings-keys
# Most settings work both on Snap and Docker below.
# Note: Do not add single quotes '' to variables. Having spaces still works without quotes where required.
#
- # DEFAULT_AUTHENTICATION_METHOD : The default authentication method used if a user does not exist to create and authenticate. Can be set as ldap.
- # example : DEFAULT_AUTHENTICATION_METHOD=ldap
- #- DEFAULT_AUTHENTICATION_METHOD=
+ # The default authentication method used if a user does not exist to create and authenticate. Can be set as ldap.
+ #- DEFAULT_AUTHENTICATION_METHOD=ldap
#
- # LDAP_ENABLE : Enable or not the connection by the LDAP
- # example : LDAP_ENABLE=true
- #- LDAP_ENABLE=false
+ # Enable or not the connection by the LDAP
+ #- LDAP_ENABLE=true
#
- # LDAP_PORT : The port of the LDAP server
- # example : LDAP_PORT=389
+ # The port of the LDAP server
#- LDAP_PORT=389
#
- # LDAP_HOST : The host server for the LDAP server
- # example : LDAP_HOST=localhost
- #- LDAP_HOST=
+ # The host server for the LDAP server
+ #- LDAP_HOST=localhost
#
- # LDAP_BASEDN : The base DN for the LDAP Tree
- # example : LDAP_BASEDN=ou=user,dc=example,dc=org
- #- LDAP_BASEDN=
+ # The base DN for the LDAP Tree
+ #- LDAP_BASEDN=ou=user,dc=example,dc=org
#
- # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
- # example : LDAP_LOGIN_FALLBACK=true
+ # Fallback on the default authentication method
#- LDAP_LOGIN_FALLBACK=false
#
- # LDAP_RECONNECT : Reconnect to the server if the connection is lost
- # example : LDAP_RECONNECT=false
+ # Reconnect to the server if the connection is lost
#- LDAP_RECONNECT=true
#
- # LDAP_TIMEOUT : Overall timeout, in milliseconds
- # example : LDAP_TIMEOUT=12345
+ # Overall timeout, in milliseconds
#- LDAP_TIMEOUT=10000
#
- # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
- # example : LDAP_IDLE_TIMEOUT=12345
+ # Specifies the timeout for idle LDAP connections in milliseconds
#- LDAP_IDLE_TIMEOUT=10000
#
- # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
- # example : LDAP_CONNECT_TIMEOUT=12345
+ # Connection timeout, in milliseconds
#- LDAP_CONNECT_TIMEOUT=10000
#
- # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
- # example : LDAP_AUTHENTIFICATION=true
- #- LDAP_AUTHENTIFICATION=false
+ # If the LDAP needs a user account to search
+ #- LDAP_AUTHENTIFICATION=true
#
- # LDAP_AUTHENTIFICATION_USERDN : The search user DN
- # example : LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
- #- LDAP_AUTHENTIFICATION_USERDN=
+ # The search user DN
+ #- LDAP_AUTHENTIFICATION_USERDN=cn=wekan_adm,ou=serviceaccounts,ou=admin,ou=prod,dc=mydomain,dc=com
#
- # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
- # example : AUTHENTIFICATION_PASSWORD=admin
- #- LDAP_AUTHENTIFICATION_PASSWORD=
+ # The password for the search user
+ #- LDAP_AUTHENTIFICATION_PASSWORD=pwd
#
- # LDAP_LOG_ENABLED : Enable logs for the module
- # example : LDAP_LOG_ENABLED=true
- #- LDAP_LOG_ENABLED=false
+ # Enable logs for the module
+ #- LDAP_LOG_ENABLED=true
#
- # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
- # example : LDAP_BACKGROUND_SYNC=true
+ # If the sync of the users should be done in the background
#- LDAP_BACKGROUND_SYNC=false
#
- # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
- # example : LDAP_BACKGROUND_SYNC_INTERVAL=12345
+ # At which interval does the background task sync in milliseconds
#- LDAP_BACKGROUND_SYNC_INTERVAL=100
#
- # LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
- # example : LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
#- LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
#
- # LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS :
- # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
#- LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
#
- # LDAP_ENCRYPTION : If using LDAPS
- # example : LDAP_ENCRYPTION=ssl
+ # If using LDAPS: LDAP_ENCRYPTION=ssl
#- LDAP_ENCRYPTION=false
#
- # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
- # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
- #- LDAP_CA_CERT=
+ # The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
+ #- LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+G2FIdAgIC...-----END CERTIFICATE-----
#
- # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
- # example : LDAP_REJECT_UNAUTHORIZED=true
+ # Reject Unauthorized Certificate
#- LDAP_REJECT_UNAUTHORIZED=false
#
- # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
- # example : LDAP_USER_SEARCH_FILTER=
+ # Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
#- LDAP_USER_SEARCH_FILTER=
#
- # LDAP_USER_SEARCH_SCOPE : base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree)
- # example : LDAP_USER_SEARCH_SCOPE=one
- #- LDAP_USER_SEARCH_SCOPE=
+ # base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree)
+ #- LDAP_USER_SEARCH_SCOPE=one
#
- # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
- # example : LDAP_USER_SEARCH_FIELD=uid
- #- LDAP_USER_SEARCH_FIELD=
+ # Which field is used to find the user, like uid / sAMAccountName
+ #- LDAP_USER_SEARCH_FIELD=sAMAccountName
#
- # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
- # example : LDAP_SEARCH_PAGE_SIZE=12345
+ # Used for pagination (0=unlimited)
#- LDAP_SEARCH_PAGE_SIZE=0
#
- # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
- # example : LDAP_SEARCH_SIZE_LIMIT=12345
+ # The limit number of entries (0=unlimited)
#- LDAP_SEARCH_SIZE_LIMIT=0
#
- # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
- # example : LDAP_GROUP_FILTER_ENABLE=true
+ # Enable group filtering
#- LDAP_GROUP_FILTER_ENABLE=false
#
- # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
- # example : LDAP_GROUP_FILTER_OBJECTCLASS=group
+ # The object class for filtering. Example: group
#- LDAP_GROUP_FILTER_OBJECTCLASS=
#
- # LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE :
- # example :
#- LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=
#
- # LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE :
- # example :
#- LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=
#
- # LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT :
- # example :
#- LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=
#
- # LDAP_GROUP_FILTER_GROUP_NAME :
- # example :
#- LDAP_GROUP_FILTER_GROUP_NAME=
#
- # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier)
- # example : LDAP_UNIQUE_IDENTIFIER_FIELD=guid
+ # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier). Example: guid
#- LDAP_UNIQUE_IDENTIFIER_FIELD=
#
# LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
- # example : LDAP_UTF8_NAMES_SLUGIFY=false
#- LDAP_UTF8_NAMES_SLUGIFY=true
#
- # LDAP_USERNAME_FIELD : Which field contains the ldap username
- # example : LDAP_USERNAME_FIELD=username
- #- LDAP_USERNAME_FIELD=
+ # LDAP_USERNAME_FIELD : Which field contains the ldap username. username / sAMAccountName
+ #- LDAP_USERNAME_FIELD=sAMAccountName
#
- # LDAP_FULLNAME_FIELD : Which field contains the ldap fullname
- # example : LDAP_FULLNAME_FIELD=fullname
- #- LDAP_FULLNAME_FIELD=
+ # LDAP_FULLNAME_FIELD : Which field contains the ldap fullname. fullname / sAMAccountName
+ #- LDAP_FULLNAME_FIELD=fullname
#
- # LDAP_MERGE_EXISTING_USERS :
- # example : LDAP_MERGE_EXISTING_USERS=true
#- LDAP_MERGE_EXISTING_USERS=false
#
- # LDAP_EMAIL_MATCH_ENABLE : allow existing account matching by e-mail address when username does not match
- # example: LDAP_EMAIL_MATCH_ENABLE=true
- #- LDAP_EMAIL_MATCH_ENABLE=false
+ # Allow existing account matching by e-mail address when username does not match
+ #- LDAP_EMAIL_MATCH_ENABLE=true
#
# LDAP_EMAIL_MATCH_REQUIRE : require existing account matching by e-mail address when username does match
- # example: LDAP_EMAIL_MATCH_REQUIRE=true
- #- LDAP_EMAIL_MATCH_REQUIRE=false
+ #- LDAP_EMAIL_MATCH_REQUIRE=true
#
# LDAP_EMAIL_MATCH_VERIFIED : require existing account email address to be verified for matching
- # example: LDAP_EMAIL_MATCH_VERIFIED=true
- #- LDAP_EMAIL_MATCH_VERIFIED=false
+ #- LDAP_EMAIL_MATCH_VERIFIED=true
#
# LDAP_EMAIL_FIELD : which field contains the LDAP e-mail address
- # example: LDAP_EMAIL_FIELD=mail
- #- LDAP_EMAIL_FIELD=
+ #- LDAP_EMAIL_FIELD=mail
#-----------------------------------------------------------------
- # LDAP_SYNC_USER_DATA :
- # example : LDAP_SYNC_USER_DATA=true
#- LDAP_SYNC_USER_DATA=false
#
- # LDAP_SYNC_USER_DATA_FIELDMAP :
- # example : LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
- #- LDAP_SYNC_USER_DATA_FIELDMAP=
+ #- LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
#
- # LDAP_SYNC_GROUP_ROLES :
- # example :
- #- LDAP_SYNC_GROUP_ROLES=
+ #- LDAP_SYNC_GROUP_ROLES=''
#
- # LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
+ # The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
# example :
- #- LDAP_DEFAULT_DOMAIN=
+ #- LDAP_DEFAULT_DOMAIN=mydomain.com
#
# Enable/Disable syncing of admin status based on ldap groups:
#- LDAP_SYNC_ADMIN_STATUS=true
@@ -585,9 +538,15 @@ services:
# - 80:80
# - 443:443
# volumes:
-# - ./nginx/ssl:/etc/nginx/ssl/
-# - ./nginx/nginx.conf:/etc/nginx/nginx.conf
-
+# - ./nginx/ssl:/etc/nginx/ssl/:ro
+# - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+## Alternative volume config:
+## volumes:
+## - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+## - ./nginx/ssl/ssl.conf:/etc/nginx/conf.d/ssl/ssl.conf:ro
+## - ./nginx/ssl/testvm-ehu.crt:/etc/nginx/conf.d/ssl/certs/mycert.crt:ro
+## - ./nginx/ssl/testvm-ehu.key:/etc/nginx/conf.d/ssl/certs/mykey.key:ro
+## - ./nginx/ssl/pphrase:/etc/nginx/conf.d/ssl/pphrase:ro
volumes:
wekan-db:
diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json
index f5c44f8d..12f6d9ba 100644
--- a/i18n/ar.i18n.json
+++ b/i18n/ar.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json
index 6bad3ab2..5831c521 100644
--- a/i18n/bg.i18n.json
+++ b/i18n/bg.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json
index c5e01719..bcddb300 100644
--- a/i18n/br.i18n.json
+++ b/i18n/br.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json
index 8a095ba8..5c7626e8 100644
--- a/i18n/ca.i18n.json
+++ b/i18n/ca.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json
index 7ab1e05e..8bcd0c1a 100644
--- a/i18n/cs.i18n.json
+++ b/i18n/cs.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "importoval(a) karta __card__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
"act-importList": "importoval(a) sloupec __list__ do swimlane __swimlane__ na tablu __board__",
"act-joinMember": "přidal(a) člena __member__ na kartu __card__ v seznamu __list__ ve swimlane __swimlane__ na tablu __board__",
- "act-moveCard": "přesunul(a) kartu __card__ ze sloupce __oldList__ ve swimlane __oldSwimlane__ na tablu __oldBoard__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "přesunul(a) kartu __card__ ze sloupce __oldList__ ve swimlane __oldSwimlane__ na tablu __oldBoard__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
"act-removeBoardMember": "odstranil(a) člena __member__ z tabla __board__",
"act-restoredCard": "obnovil(a) kartu __card__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
"act-unjoinMember": "odstranil(a) člena __member__ z karty __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
diff --git a/i18n/da.i18n.json b/i18n/da.i18n.json
index 61b6c4ac..f11a24ec 100644
--- a/i18n/da.i18n.json
+++ b/i18n/da.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json
index 8701c9d4..df768ad4 100644
--- a/i18n/de.i18n.json
+++ b/i18n/de.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "importiert Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ in Board __board__ ",
"act-importList": "importiert Liste __list__ bei Swimlane __swimlane__ in Board __board__ ",
"act-joinMember": "fügt Mitglied __member__ der Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__ hinzu",
- "act-moveCard": "verschiebt Karte __card__ von Liste __oldList__ von Swimlane __oldSwimlane__ von Board __oldBoard__ nach Liste __list__ in Swimlane __swimlane__ zu Board __board__",
+ "act-moveCard": "verschiebt Karte __card__ auf Board __board__ von Liste __oldList__ in Swimlane __oldSwimlane__ zu Liste __list__ in Swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "verschiebt Karte __card__ von Liste __oldList__ von Swimlane __oldSwimlane__ von Board __oldBoard__ nach Liste __list__ in Swimlane __swimlane__ zu Board __board__",
"act-removeBoardMember": "entfernte Mitglied __member__ vom Board __board__",
"act-restoredCard": "wiederherstellte Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
"act-unjoinMember": "entfernte Mitglied __member__ von Karte __card__ auf der Liste __list__ bei Swimlane __swimlane__ an Board __board__",
diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json
index 44173f52..bb5f778f 100644
--- a/i18n/el.i18n.json
+++ b/i18n/el.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json
index 5e24cfd3..1f1fb67f 100644
--- a/i18n/en-GB.i18n.json
+++ b/i18n/en-GB.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 580a9456..009eed3b 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json
index d8f8c1cc..9a1961cf 100644
--- a/i18n/eo.i18n.json
+++ b/i18n/eo.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json
index 08af58ae..86cb5cf8 100644
--- a/i18n/es-AR.i18n.json
+++ b/i18n/es-AR.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json
index 24d5f379..df346cea 100644
--- a/i18n/es.i18n.json
+++ b/i18n/es.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "importada la tarjeta __card__ a la lista __list__ del carrril __swimlane__ del tablero __board__",
"act-importList": "importada la lista __list__ al carril __swimlane__ del tablero __board__",
"act-joinMember": "añadido el miembro __member__ a la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
- "act-moveCard": "movida la tarjeta __card__ de la lista __oldList__ del carril __oldSwimlane__ del tablero __oldBoard__ a la lista __list__ del carril __swimlane__ del tablero __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "movida la tarjeta __card__ de la lista __oldList__ del carril __oldSwimlane__ del tablero __oldBoard__ a la lista __list__ del carril __swimlane__ del tablero __board__",
"act-removeBoardMember": "eliminado el miembro __member__ del tablero __board__",
"act-restoredCard": "restaurada la tarjeta __card__ a la lista __list__ del carril __swimlane__ del tablero __board__",
"act-unjoinMember": "eliminado el miembro __member__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
@@ -417,8 +418,8 @@
"search-cards": "Buscar entre los títulos y las descripciones de las tarjetas en este tablero.",
"search-example": "¿Texto a buscar?",
"select-color": "Seleccionar el color",
- "set-wip-limit-value": "Fija un límite para el número máximo de tareas en esta lista.",
- "setWipLimitPopup-title": "Fija el límite del trabajo en proceso",
+ "set-wip-limit-value": "Cambiar el límite para el número máximo de tareas en esta lista.",
+ "setWipLimitPopup-title": "Cambiar el límite del trabajo en proceso",
"shortcut-assign-self": "Asignarte a ti mismo a la tarjeta actual",
"shortcut-autocomplete-emoji": "Autocompletar emoji",
"shortcut-autocomplete-members": "Autocompletar miembros",
@@ -567,8 +568,8 @@
"activity-added-label-card": "añadida etiqueta '%s'",
"activity-removed-label-card": "eliminada etiqueta '%s'",
"activity-delete-attach-card": "eliminado un adjunto",
- "activity-set-customfield": "set custom field '%s' to '%s' in %s",
- "activity-unset-customfield": "unset custom field '%s' in %s",
+ "activity-set-customfield": "Cambiar el campo personalizado '%s' a '%s' en %s",
+ "activity-unset-customfield": "Desmarcar el campo personalizado '%s' en %s",
"r-rule": "Regla",
"r-add-trigger": "Añadir disparador",
"r-add-action": "Añadir acción",
diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json
index 6ef06e29..b5f0e0d0 100644
--- a/i18n/eu.i18n.json
+++ b/i18n/eu.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json
index f440fc48..da466f7f 100644
--- a/i18n/fa.i18n.json
+++ b/i18n/fa.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json
index 594c55c6..a0cc3de0 100644
--- a/i18n/fi.i18n.json
+++ b/i18n/fi.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "tuotu kortti __card__ listalle __list__ swimlanella __swimlane__ taululla __board__",
"act-importList": "tuotu lista __list__ swimlanelle __swimlane__ taululla __board__",
"act-joinMember": "lisätty jäsen __member__ kortille __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
- "act-moveCard": "siirretty kortti __card__ listasta __oldList__ swimlanella __oldSwimlane__ taululla __oldBoard__ listalle __list__ swimlanella __swimlane__ taululla __board__",
+ "act-moveCard": "siirsi kortin __card__ taululla __board__ listasta __oldList__ swimlanelta __oldSwimlane__ listalle __list__ swimlanelle __swimlane__",
+ "act-moveCardToOtherBoard": "siirretty kortti __card__ listasta __oldList__ swimlanella __oldSwimlane__ taululla __oldBoard__ listalle __list__ swimlanella __swimlane__ taululla __board__",
"act-removeBoardMember": "poistettu jäsen __member__ taululta __board__",
"act-restoredCard": "palautettu kortti __card__ listalle __list__ swimlanella __swimlane__ taululla __board__",
"act-unjoinMember": "poistettu jäsen __member__ kortilta __card__ listalla __list__ swimlanella __swimlane__ taululla __board__",
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index 848941d3..ce685738 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "a importé la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
"act-importList": "a importé la liste __list__ du couloir __swimlane__ du tableau __board__",
"act-joinMember": "a ajouté le participant __member__ à la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
- "act-moveCard": "a déplacé la carte __card__ de la liste __oldList__ du couloir __oldSwimlane__ du tableau __oldBoard__ vers la liste __list__ du couloir __swimlane__ du tableau __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "a déplacé la carte __card__ de la liste __oldList__ du couloir __oldSwimlane__ du tableau __oldBoard__ vers la liste __list__ du couloir __swimlane__ du tableau __board__",
"act-removeBoardMember": "a supprimé le participant __member__ du tableau __board__",
"act-restoredCard": "a restauré la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
"act-unjoinMember": "a supprimé le participant __member__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__",
diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json
index b896e400..e719e317 100644
--- a/i18n/gl.i18n.json
+++ b/i18n/gl.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json
index 0389299b..4822507a 100644
--- a/i18n/he.i18n.json
+++ b/i18n/he.i18n.json
@@ -1,11 +1,11 @@
{
"accept": "אישור",
"act-activity-notify": "הודעת פעילות",
- "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+ "act-addAttachment": "הקובץ __attachment__ צורף אל הכרטיס __card__ ברשימה __list__ למסלול __swimlane__ שבלוח __board__",
+ "act-deleteAttachment": "הקובץ __attachment__ נמחק מהכרטיס __card__ ברשימה __list__ מהמסלול __swimlane__ שבלוח __board__",
+ "act-addSubtask": "תת־משימה __attachment__ נוספה אל הכרטיס __card__ ברשימה __list__ למסלול __swimlane__ שבלוח __board__",
+ "act-addLabel": "התווית __label__ נוספה לכרטיס __card__ ברשימה __list__ למסלול __swimlane__ שבלוח __board__",
+ "act-removeLabel": "התווית __label__ הוסרה מהכרטיס __card__ ברשימה __list__ מהמסלול __swimlane__ שבלוח __board__",
"act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
"act-addChecklistItem": "נוסף פריט סימון __checklistItem__ לרשימת המטלות __checklist__ לכרטיס __card__ ברשימה __list__ במסלול __swimlane__ בלוח __board__",
"act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
@@ -16,19 +16,20 @@
"act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
"act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
"act-createBoard": "הלוח __board__ נוצר",
- "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-createCard": "הכרטיס __card__ נוצר ברשימה __list__ במסלול __swimlane__ שבלוח __board__",
"act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-createList": "added list __list__ to board __board__",
- "act-addBoardMember": "added member __member__ to board __board__",
+ "act-createList": "הרשימה __list__ נוספה ללוח __board__",
+ "act-addBoardMember": "החבר __member__ נוסף אל __board__",
"act-archivedBoard": "הלוח __board__ הועבר לארכיון",
"act-archivedCard": "הכרטיס __card__ ברשימה __list__ במסלול __swimlane__ בלוח __board__ הועבר לארכיון",
"act-archivedList": "הרשימה __list__ במסלול __swimlane__ בלוח __board__ הועברה לארכיון",
"act-archivedSwimlane": "המסלול __swimlane__ בלוח __board__ הועבר לארכיון",
"act-importBoard": "הייבוא של הלוח __board__ הושלם",
"act-importCard": "הייבוא של הכרטיס __card__ לרשימה __list__ למסלול __swimlane__ ללוח __board__ הושלם",
- "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+ "act-importList": "הרשימה __list__ ייובאה למסלול __swimlane__ שבלוח __board__",
"act-joinMember": "החבר __member__ נוסף לכרטיס __card__ לרשימה __list__ במסלול __swimlane__ בלוח __board__",
- "act-moveCard": "הכרטיס __card__ הועבר מהרשימה __oldList__ במסלול __oldSwimlane__ בלוח __oldBoard__ לרשימה __list__ במסלול __swimlane__ בלוח __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "הכרטיס __card__ הועבר מהרשימה __oldList__ במסלול __oldSwimlane__ בלוח __oldBoard__ לרשימה __list__ במסלול __swimlane__ בלוח __board__",
"act-removeBoardMember": "החבר __member__ הוסר מהלוח __board__",
"act-restoredCard": "הכרטיס __card__ שוחזר לרשימה __list__ למסלול __swimlane__ ללוח __board__",
"act-unjoinMember": "החבר __member__ הוסר מהכרטיס __card__ ברשימה __list__ במסלול __swimlane__ בלוח __board__",
diff --git a/i18n/hi.i18n.json b/i18n/hi.i18n.json
index b121e3b5..79c13b34 100644
--- a/i18n/hi.i18n.json
+++ b/i18n/hi.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json
index cb500412..30de63ab 100644
--- a/i18n/hu.i18n.json
+++ b/i18n/hu.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json
index 4068520c..24879447 100644
--- a/i18n/hy.i18n.json
+++ b/i18n/hy.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json
index 926623e1..be3898f8 100644
--- a/i18n/id.i18n.json
+++ b/i18n/id.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json
index 789e6e14..44fba953 100644
--- a/i18n/ig.i18n.json
+++ b/i18n/ig.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json
index ec354c94..e0d1d982 100644
--- a/i18n/it.i18n.json
+++ b/i18n/it.i18n.json
@@ -1,37 +1,38 @@
{
"accept": "Accetta",
"act-activity-notify": "Notifica attività ",
- "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-createBoard": "created board __board__",
- "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
- "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-createList": "added list __list__ to board __board__",
- "act-addBoardMember": "added member __member__ to board __board__",
- "act-archivedBoard": "Board __board__ moved to Archive",
- "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
- "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
- "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
- "act-importBoard": "imported board __board__",
- "act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
- "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
- "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
- "act-removeBoardMember": "removed member __member__ from board __board__",
- "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
- "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+ "act-addAttachment": "aggiunto allegato __attachment__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+ "act-deleteAttachment": "eliminato allegato __attachment__ dalla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+ "act-addSubtask": "aggiunto sottotask __subtask__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+ "act-addLabel": "aggiunta etichetta __label__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+ "act-removeLabel": "rimossa etichetta __label__ dalla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+ "act-addChecklist": "aggiunta lista di controllo __label__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+ "act-addChecklistItem": "aggiunto elemento __checklistItem__ alla lista di controllo __checklist__ della scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+ "act-removeChecklist": "rimossa lista di controllo __checklist__ dalla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+ "act-removeChecklistItem": "rimosso elemento __checklistitem__ dalla lista di controllo __checkList__ della scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
+ "act-checkedItem": "attivato __checklistitem__ nella lista di controllo __checklist__ della scheda __card__ della lista __list__ della corsia __swimlane__ nella bacheca __board__",
+ "act-uncheckedItem": "disattivato __checklistItem__ della lista di controllo __checklist__ dalla scheda __card__ della lista __list__ della corsia __swimlane__ nella bacheca __board__",
+ "act-completeChecklist": "completata lista di controllo __checklist__ nella scheda __card__ della lista __list__ della corsia __swimlane__ nella bacheca __board__",
+ "act-uncompleteChecklist": "lista di controllo __checklist__ incompleta nella scheda __card__ della lista __list__ in corsia __swimlane__ della bacheca __board__",
+ "act-addComment": "commento sulla scheda __card__: __comment__ nella lista __list__ della corsia __swimlane__ della bacheca __board__",
+ "act-createBoard": "bacheca __board__ creata",
+ "act-createCard": "scheda __card__ creata nella lista __list__ della corsia __swimlane__ della bacheca __board__",
+ "act-createCustomField": "campo personalizzato __customField__ creato nella scheda __card__ della lista __list__ in corsia __swimlane__ della bacheca __board__",
+ "act-createList": "aggiunta lista __list__ alla bacheca __board__",
+ "act-addBoardMember": "aggiunto membro __member__ alla bacheca __board__",
+ "act-archivedBoard": "Bacheca __board__ archiviata",
+ "act-archivedCard": "Scheda __card__ della lista __list__ della corsia __swimlane__ della bacheca __board__ archiviata",
+ "act-archivedList": "Lista __list__ della corsia __swimlane__ della bacheca __board__ archiviata",
+ "act-archivedSwimlane": "Corsia __swimlane__ della bacheca __board__ archiviata",
+ "act-importBoard": "Bacheca __board__ importata",
+ "act-importCard": "scheda importata __card__ nella lista __list__ della corsia __swimlane__ della bacheca __board__",
+ "act-importList": "lista __list__ importata nella corsia __swimlane__ della bacheca __board__",
+ "act-joinMember": "aggiunto membro __member__ alla scheda __card__ della list __list__ nella corsia __swimlane__ della bacheca __board__",
+ "act-moveCard": "spostata scheda __card__ della bacheca __board__ dalla lista __oldList__ della corsia __oldSwimlane__ alla lista __list__ della corsia __swimlane__",
+ "act-moveCardToOtherBoard": "postata scheda __card__ dalla lista __oldList__ della corsia __oldSwimlane__ della bacheca __oldBoard__ alla lista __list__ nella corsia __swimlane__ della bacheca __board__",
+ "act-removeBoardMember": "rimosso membro __member__ dalla bacheca __board__",
+ "act-restoredCard": "scheda ripristinata __card__ della lista __list__ nella corsia __swimlane__ della bacheca __board__",
+ "act-unjoinMember": "rimosso membro __member__ dalla scheda __card__ della lista __list__ della corsia __swimlane__ nella bacheca __board__",
"act-withBoardTitle": "__board__",
"act-withCardTitle": "[__board__] __card__",
"actions": "Azioni",
@@ -56,14 +57,14 @@
"activity-unchecked-item": "disattivato %s nella checklist %s di %s",
"activity-checklist-added": "aggiunta checklist a %s",
"activity-checklist-removed": "È stata rimossa una checklist da%s",
- "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+ "activity-checklist-completed": "checklist __checklist__ completata nella scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
"activity-checklist-uncompleted": "La checklist non è stata completata",
"activity-checklist-item-added": "Aggiunto l'elemento checklist a '%s' in %s",
"activity-checklist-item-removed": "è stato rimosso un elemento della checklist da '%s' in %s",
"add": "Aggiungere",
"activity-checked-item-card": "%s è stato selezionato nella checklist %s",
"activity-unchecked-item-card": "%s è stato deselezionato nella checklist %s",
- "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+ "activity-checklist-completed-card": "checklist __label__ completata nella scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
"activity-checklist-uncompleted-card": "La checklist %s non è completa",
"add-attachment": "Aggiungi Allegato",
"add-board": "Aggiungi Bacheca",
@@ -567,8 +568,8 @@
"activity-added-label-card": "aggiunta etichetta '%s'",
"activity-removed-label-card": "L' etichetta '%s' è stata rimossa.",
"activity-delete-attach-card": "Cancella un allegato",
- "activity-set-customfield": "set custom field '%s' to '%s' in %s",
- "activity-unset-customfield": "unset custom field '%s' in %s",
+ "activity-set-customfield": "imposta campo personalizzato '%s' a '%s' in %s",
+ "activity-unset-customfield": "campo personalizzato non impostato '%s' in %s",
"r-rule": "Ruolo",
"r-add-trigger": "Aggiungi trigger",
"r-add-action": "Aggiungi azione",
@@ -670,7 +671,7 @@
"cas": "CAS",
"authentication-method": "Metodo di Autenticazione",
"authentication-type": "Tipo Autenticazione",
- "custom-product-name": "Personalizza il nome del prodotto",
+ "custom-product-name": "Nome prodotto personalizzato",
"layout": "Layout",
"hide-logo": "Nascondi il logo",
"add-custom-html-after-body-start": "Aggiungi codice HTML personalizzato dopo <body> inzio",
diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json
index 6b1fcf1c..55d3f265 100644
--- a/i18n/ja.i18n.json
+++ b/i18n/ja.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/ka.i18n.json b/i18n/ka.i18n.json
index 4fe0f734..8ea2fc93 100644
--- a/i18n/ka.i18n.json
+++ b/i18n/ka.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/km.i18n.json b/i18n/km.i18n.json
index e234ee75..453ae4f3 100644
--- a/i18n/km.i18n.json
+++ b/i18n/km.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json
index 4e6835e0..9751266d 100644
--- a/i18n/ko.i18n.json
+++ b/i18n/ko.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json
index d4ded323..0dc05cd2 100644
--- a/i18n/lv.i18n.json
+++ b/i18n/lv.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/mk.i18n.json b/i18n/mk.i18n.json
index 3170c6d2..73322d5a 100644
--- a/i18n/mk.i18n.json
+++ b/i18n/mk.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json
index a255469c..11cfe4ed 100644
--- a/i18n/mn.i18n.json
+++ b/i18n/mn.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json
index 4ebb4c5f..2d8f4af2 100644
--- a/i18n/nb.i18n.json
+++ b/i18n/nb.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json
index 2f02d194..790b094b 100644
--- a/i18n/nl.i18n.json
+++ b/i18n/nl.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/oc.i18n.json b/i18n/oc.i18n.json
index 57389d44..f5f2ae84 100644
--- a/i18n/oc.i18n.json
+++ b/i18n/oc.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "as importat la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
"act-importList": "as importat la tièra __list__ del corredor __swimlane__ del tablèu __board__",
"act-joinMember": "as apondut un participant __member__ a la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
- "act-moveCard": "as desplaçat la carta __card__ de la tièra __oldList__ del corredor __oldSwimlane__ del tablèu __oldBoard__ cap a la tièra __list__ del corredor __swimlane__ del tablèu __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "as desplaçat la carta __card__ de la tièra __oldList__ del corredor __oldSwimlane__ del tablèu __oldBoard__ cap a la tièra __list__ del corredor __swimlane__ del tablèu __board__",
"act-removeBoardMember": "as tirat lo participant __member__ del tablèu __board__",
"act-restoredCard": "as restorat la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
"act-unjoinMember": "as tirat lo participant __member__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
@@ -56,14 +57,14 @@
"activity-unchecked-item": "as descroiat %s dins la checklist %s de %s",
"activity-checklist-added": "as apondut a checklist a %s",
"activity-checklist-removed": "as tirat la checklist de %s",
- "activity-checklist-completed": "as acabat la checklist __checklist__ de la carta __card__ de la lista __list__ del corredor __swimlane__ del tablèu __board__",
+ "activity-checklist-completed": "as acabat la checklist __checklist__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
"activity-checklist-uncompleted": "as rendut incomplet la checklist %s de %s",
"activity-checklist-item-added": "as apondut un element a la checklist '%s' dins %s",
"activity-checklist-item-removed": "as tirat un element a la checklist '%s' dins %s",
"add": "Apondre",
"activity-checked-item-card": "as croiat %s dins la checklist %s",
"activity-unchecked-item-card": "as descroiat %s dins la checklist %s",
- "activity-checklist-completed-card": "as acabat la checklist__checklist__ de la carta __card__ de la lista __list__ del corredor __swimlane__ del tablèu __board__",
+ "activity-checklist-completed-card": "as acabat la checklist__checklist__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__",
"activity-checklist-uncompleted-card": "as rendut incomplet la checklist %s",
"add-attachment": "Apondre una pèça joncha",
"add-board": "Apondre un tablèu",
@@ -172,7 +173,7 @@
"changePermissionsPopup-title": "Cambiar las permissions",
"changeSettingsPopup-title": "Cambiar los paramètres",
"subtasks": "Jos-tasca",
- "checklists": "Checklistas",
+ "checklists": "Checklists",
"click-to-star": "Apondre lo tablèu als favorits",
"click-to-unstar": "Quitar lo tablèu dels favorits",
"clipboard": "Copiar o far limpar",
@@ -343,17 +344,17 @@
"leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
"leaveBoardPopup-title": "Leave Board ?",
"link-card": "Ligam per aquesta carta",
- "list-archive-cards": "Mandar totas las cartas d'aquesta lista dins Archius",
+ "list-archive-cards": "Mandar totas las cartas d'aquesta tièra dins Archius",
"list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
- "list-move-cards": "Mandar totas las cartas dins aquesta lista",
- "list-select-cards": "Seleccionar totas las cartas dins aquesta lista",
+ "list-move-cards": "Mandar totas las cartas dins aquesta tièra",
+ "list-select-cards": "Seleccionar totas las cartas dins aquesta tièra",
"set-color-list": "Set Color",
"listActionPopup-title": "Tièra de las accions",
"swimlaneActionPopup-title": "Swimlane Actions",
"swimlaneAddPopup-title": "Add a Swimlane below",
"listImportCardPopup-title": "Importar una carta de Trello",
"listMorePopup-title": "Mai",
- "link-list": "Ligam d'aquesta lista",
+ "link-list": "Ligam d'aquesta tièra",
"list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
"list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
"lists": "Tièras",
@@ -376,7 +377,7 @@
"my-boards": "Mon tablèu",
"name": "Nom",
"no-archived-cards": "Pas cap de carta dins Archius",
- "no-archived-lists": "Pas cap de lista dins Archius",
+ "no-archived-lists": "Pas cap de tièra dins Archius",
"no-archived-swimlanes": "Pas cap de corredor dins Archius",
"no-results": "Pas brica de resultat",
"normal": "Normal",
@@ -403,7 +404,7 @@
"remove-cover": "Remove Cover",
"remove-from-board": "Quitar lo tablèu",
"remove-label": "Quitar l'etiqueta",
- "listDeletePopup-title": "Suprimir la lista ?",
+ "listDeletePopup-title": "Quitar la tièra ?",
"remove-member": "Quitar lo participant",
"remove-member-from-card": "Quitar aquesta carta",
"remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json
index 526492cb..ac7d0f4d 100644
--- a/i18n/pl.i18n.json
+++ b/i18n/pl.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "Zaimportowano kartę __card__ do listy __list__ na diagramie czynności __swimlane__ na tablicy __board__",
"act-importList": "Zaimportowano listę __list__ na diagram czynności __swimlane__ do tablicy __board__",
"act-joinMember": "Dodano użytkownika __member__ do karty __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__",
- "act-moveCard": "Przeniesiono kartę __card__ z listy __oldList__ na diagramie czynności __oldSwimlane__ na tablicy __oldBoard__ do listy __listy__ na diagramie czynności __swimlane__ na tablicy __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "Przeniesiono kartę __card__ z listy __oldList__ na diagramie czynności __oldSwimlane__ na tablicy __oldBoard__ do listy __listy__ na diagramie czynności __swimlane__ na tablicy __board__",
"act-removeBoardMember": "Usunięto użytkownika __member__ z tablicy __board__",
"act-restoredCard": "Przywrócono kartę __card__ na listę __list__ na diagram czynności__ na tablicy __board__",
"act-unjoinMember": "Usunięto użytkownika __member__ z karty __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__",
diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json
index 20028ab2..7a7264b5 100644
--- a/i18n/pt-BR.i18n.json
+++ b/i18n/pt-BR.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "importado cartão __card__ para lista __list__ em raia __swimlane__ no quadro __board__",
"act-importList": "importada lista __list__ para raia __swimlane__ no quadro __board__",
"act-joinMember": "adicionado membro __member__ ao cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
- "act-moveCard": "movido cartão __card__ da lista __oldList__ em raia __oldSwimlane__ no quadro __oldBoard__ para lista __list__ em raia __swimlane__ no quadro __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "movido cartão __card__ da lista __oldList__ em raia __oldSwimlane__ no quadro __oldBoard__ para lista __list__ em raia __swimlane__ no quadro __board__",
"act-removeBoardMember": "removido membro __member__ do quadro __board__",
"act-restoredCard": "restaurado cartão __card__ a lista __list__ em raia __swimlane__ no quadro __board__",
"act-unjoinMember": "removido membro __member__ do cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__",
@@ -567,8 +568,8 @@
"activity-added-label-card": "adicionada etiqueta '%s'",
"activity-removed-label-card": "removida etiqueta '%s'",
"activity-delete-attach-card": "excluido um anexo",
- "activity-set-customfield": "set custom field '%s' to '%s' in %s",
- "activity-unset-customfield": "unset custom field '%s' in %s",
+ "activity-set-customfield": "definir campo personalizado '%s' para '%s' em %s",
+ "activity-unset-customfield": "redefinir campo personalizado '%s' em %s",
"r-rule": "Regra",
"r-add-trigger": "Adicionar gatilho",
"r-add-action": "Adicionar ação",
diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json
index d29c3ae8..70478aeb 100644
--- a/i18n/pt.i18n.json
+++ b/i18n/pt.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json
index 92d604ca..4d2a3fe4 100644
--- a/i18n/ro.i18n.json
+++ b/i18n/ro.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json
index d5169aef..497e042f 100644
--- a/i18n/ru.i18n.json
+++ b/i18n/ru.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "импортировал карточку __card__ в список __list__ на дорожку __swimlane__ доски __board__",
"act-importList": "импортировал список __list__ на дорожку __swimlane__ доски __board__",
"act-joinMember": "добавил участника __member__ в карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
- "act-moveCard": "переместил карточку __card__ из списка __oldList__ с дорожки __oldSwimlane__ доски __oldBoard__ в список __list__ на дорожку __swimlane__ доски __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "переместил карточку __card__ из списка __oldList__ с дорожки __oldSwimlane__ доски __oldBoard__ в список __list__ на дорожку __swimlane__ доски __board__",
"act-removeBoardMember": "удалил участника __member__ с доски __board__",
"act-restoredCard": "восстановил карточку __card__ в список __list__ на дорожку __swimlane__ доски __board__",
"act-unjoinMember": "удалил участника __member__ из карточки __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json
index c496971c..dfebbcfa 100644
--- a/i18n/sr.i18n.json
+++ b/i18n/sr.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json
index 647c3c10..a3be3e94 100644
--- a/i18n/sv.i18n.json
+++ b/i18n/sv.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "importerade kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
"act-importList": "importerade lista __list__ i simbana __swimlane__ på tavla __board__",
"act-joinMember": "la till medlem __member__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
- "act-moveCard": "flyttade kort __card__ från lista __oldList__ i simbana __oldSwimlane__ på tavla __oldBoard__ till lista __list__ i simbana __swimlane__ på tavla __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "flyttade kort __card__ från lista __oldList__ i simbana __oldSwimlane__ på tavla __oldBoard__ till lista __list__ i simbana __swimlane__ på tavla __board__",
"act-removeBoardMember": "borttagen medlem __member__  från tavla __board__",
"act-restoredCard": "återställde kort __card__ till lista __lis__ i simbana __swimlane__ på tavla __board__",
"act-unjoinMember": "tog bort medlem __member__ från kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
diff --git a/i18n/sw.i18n.json b/i18n/sw.i18n.json
index ab693571..72322032 100644
--- a/i18n/sw.i18n.json
+++ b/i18n/sw.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json
index a82c6944..61402cab 100644
--- a/i18n/ta.i18n.json
+++ b/i18n/ta.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json
index 82526686..2b7816b1 100644
--- a/i18n/th.i18n.json
+++ b/i18n/th.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json
index f9b8158c..a9967203 100644
--- a/i18n/tr.i18n.json
+++ b/i18n/tr.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json
index 98a8978f..57a3703f 100644
--- a/i18n/uk.i18n.json
+++ b/i18n/uk.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json
index a3a65ff3..8bdf6deb 100644
--- a/i18n/vi.i18n.json
+++ b/i18n/vi.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json
index 36a603cc..612b5ae8 100644
--- a/i18n/zh-CN.i18n.json
+++ b/i18n/zh-CN.i18n.json
@@ -1,37 +1,38 @@
{
"accept": "接受",
"act-activity-notify": "活动通知",
- "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-createBoard": "created board __board__",
+ "act-addAttachment": "添加附件 __attachment__ 到看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中",
+ "act-deleteAttachment": "删除看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的附件 __attachment__",
+ "act-addSubtask": "添加子任务 __subtask__ 到看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中",
+ "act-addLabel": "添加标签 __label__ 到看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中",
+ "act-removeLabel": "移除看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的标签 __label__ ",
+ "act-addChecklist": "添加清单 __checklist__ 到看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中",
+ "act-addChecklistItem": "添加清单项 __checklistItem__ 到看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的清单 __checklist__",
+ "act-removeChecklist": "移除看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的清单 __checklist__",
+ "act-removeChecklistItem": "移除看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的清单 __checklist__ 清单项 __checklistItem__",
+ "act-checkedItem": "选中看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的清单 __checklist__ 的清单项 __checklistItem__",
+ "act-uncheckedItem": "反选看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的清单 __checklist__ 的清单项 __checklistItem__",
+ "act-completeChecklist": "完成检查列表__checklist__ 卡片 __card__ 列表 __list__ 泳道 __swimlane__ 看板 __board__",
+ "act-uncompleteChecklist": "看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 中的清单 __checklist__ 未完成",
+ "act-addComment": "对看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 __card__ 发表了评论: __comment__ ",
+ "act-createBoard": "创建看板 __board__",
"act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-createList": "added list __list__ to board __board__",
+ "act-createList": "添加列表 __list__ 至看板 __board__",
"act-addBoardMember": "added member __member__ to board __board__",
- "act-archivedBoard": "Board __board__ moved to Archive",
+ "act-archivedBoard": "看板 __board__ 已被移入归档",
"act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
- "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
- "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
- "act-importBoard": "imported board __board__",
+ "act-archivedList": "看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 已被移入归档",
+ "act-archivedSwimlane": "看板 __board__ 中的泳道 __swimlane__ 已被移入归档",
+ "act-importBoard": "导入看板 __board__",
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
- "act-removeBoardMember": "removed member __member__ from board __board__",
- "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
- "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "移动卡片 __card__ 从列表 __oldList__ 泳道 __oldSwimlane__ 看板 __oldBoard__ 至列表 __list__ 泳道 __swimlane__ 看板 __board__",
+ "act-removeBoardMember": "从看板 __board__ 移除成员 __member__ ",
+ "act-restoredCard": "恢复卡片 __card__ 至列表 __list__ 泳道 __swimlane__ 看板 __board__",
+ "act-unjoinMember": "移除成员 __member__ 从卡片 __card__ 列表 __list__ a泳道 __swimlane__ 看板 __board__",
"act-withBoardTitle": "看板__board__",
"act-withCardTitle": "[看板 __board__] 卡片 __card__",
"actions": "操作",
@@ -56,14 +57,14 @@
"activity-unchecked-item": "未勾选 %s 于清单 %s 共 %s",
"activity-checklist-added": "已经将清单添加到 %s",
"activity-checklist-removed": "已从%s移除待办清单",
- "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+ "activity-checklist-completed": "完成检查列表__checklist__ 卡片 __card__ 列表 __list__ 泳道 __swimlane__ 看板 __board__",
"activity-checklist-uncompleted": "未完成清单 %s 共 %s",
"activity-checklist-item-added": "添加清单项至'%s' 于 %s",
"activity-checklist-item-removed": "已从 '%s' 于 %s中 移除一个清单项",
"add": "添加",
"activity-checked-item-card": "勾选 %s 与清单 %s 中",
"activity-unchecked-item-card": "取消勾选 %s 于清单 %s中",
- "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+ "activity-checklist-completed-card": "完成检查列表 __checklist__ 卡片 __card__ 列表 __list__ 泳道 __swimlane__ 看板 __board__",
"activity-checklist-uncompleted-card": "未完成清单 %s",
"add-attachment": "添加附件",
"add-board": "添加看板",
@@ -567,8 +568,8 @@
"activity-added-label-card": "已添加标签 '%s'",
"activity-removed-label-card": "已移除标签 '%s'",
"activity-delete-attach-card": "已删除附件",
- "activity-set-customfield": "set custom field '%s' to '%s' in %s",
- "activity-unset-customfield": "unset custom field '%s' in %s",
+ "activity-set-customfield": "设置自定义字段 '%s' 至 '%s' 于 %s",
+ "activity-unset-customfield": "未设置自定义字段 '%s' 于 %s",
"r-rule": "规则",
"r-add-trigger": "添加触发器",
"r-add-action": "添加行动",
diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json
index c917609e..6c5f194c 100644
--- a/i18n/zh-TW.i18n.json
+++ b/i18n/zh-TW.i18n.json
@@ -28,7 +28,8 @@
"act-importCard": "imported card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
"act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
- "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+ "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+ "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-removeBoardMember": "removed member __member__ from board __board__",
"act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
"act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
diff --git a/models/settings.js b/models/settings.js
index 4fcc36ac..e0f94fca 100644
--- a/models/settings.js
+++ b/models/settings.js
@@ -231,7 +231,7 @@ if (Meteor.isServer) {
const setting = Settings.findOne({});
if (!setting.productName) {
return {
- productName: 'Wekan',
+ productName: '',
};
} else {
return {
diff --git a/openapi/README.md b/openapi/README.md
index c353ffd4..e3fb7fd9 100644
--- a/openapi/README.md
+++ b/openapi/README.md
@@ -20,7 +20,7 @@ Now that we have the OpenAPI, it's easy enough to convert the YAML file into som
[shins](https://github.com/Mermade/shins) and [api2html](https://github.com/tobilg/api2html),
or even [ReDoc](https://github.com/Rebilly/ReDoc):
- api2html -c ../public/wekan-logo-header.png -o api.html ../public/wekan_api.yml
+ api2html -c ../public/logo-header.png -o api.html ../public/wekan_api.yml
or
diff --git a/package.json b/package.json
index 04804563..6118d9ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wekan",
- "version": "v2.51.0",
+ "version": "v2.52.0",
"description": "Open-Source kanban",
"private": true,
"scripts": {
diff --git a/public/wekan-favicon.png b/public/favicon.png
index 8beb85f4..8beb85f4 100644
--- a/public/wekan-favicon.png
+++ b/public/favicon.png
Binary files differ
diff --git a/public/wekan-150.png b/public/logo-150.png
index e8e89c62..e8e89c62 100644
--- a/public/wekan-150.png
+++ b/public/logo-150.png
Binary files differ
diff --git a/public/wekan-150.svg b/public/logo-150.svg
index 51d4eede..51d4eede 100644
--- a/public/wekan-150.svg
+++ b/public/logo-150.svg
diff --git a/public/wekan-logo-header.png b/public/logo-header.png
index 16ffa102..16ffa102 100644
--- a/public/wekan-logo-header.png
+++ b/public/logo-header.png
Binary files differ
diff --git a/public/wekan-logo.png b/public/logo.png
index b553239e..b553239e 100644
--- a/public/wekan-logo.png
+++ b/public/logo.png
Binary files differ
diff --git a/public/wekan-manifest.json b/public/manifest.json
index a1c18518..e35583c0 100644
--- a/public/wekan-manifest.json
+++ b/public/manifest.json
@@ -1,16 +1,16 @@
{
- "name": "Wekan",
- "short_name": "Wekan",
- "description": "The open-source Trello-like kanban",
+ "name": "Kanban",
+ "short_name": "Kanban",
+ "description": "The open-source kanban",
"lang": "en-US",
"icons": [
{
- "src": "/wekan-150.png",
+ "src": "/logo-150.png",
"type": "image/png",
"sizes": "150x150"
},
{
- "src": "/wekan-150.svg",
+ "src": "/logo-150.svg",
"type": "image/svg+xml",
"sizes": "150x150"
}
diff --git a/public/old-wekan-logo.png b/public/old-logo.png
index 6a2740f2..6a2740f2 100644
--- a/public/old-wekan-logo.png
+++ b/public/old-logo.png
Binary files differ
diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat
index 5d0fa37d..ca4d7f61 100644
--- a/rebuild-wekan.bat
+++ b/rebuild-wekan.bat
@@ -1,6 +1,7 @@
@ECHO OFF
-REM IN PROGRESS: Build on Windows.
+REM NOTE: THIS .BAT DOES NOT WORK !!
+REM Use instead this webpage instructions to build on Windows:
REM https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows
REM Please add fix PRs, like config of MongoDB etc.
diff --git a/releases/rebuild-wekan.sh b/releases/rebuild-wekan.sh
index ed439696..bee5a228 100755
--- a/releases/rebuild-wekan.sh
+++ b/releases/rebuild-wekan.sh
@@ -94,6 +94,11 @@ do
git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+ git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
+ mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+ mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+ rm -rf meteor-accounts-oidc
+
if [[ "$OSTYPE" == "darwin"* ]]; then
echo "sed at macOS";
sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
diff --git a/releases/virtualbox/start-wekan.sh b/releases/virtualbox/start-wekan.sh
index 9a948bac..77fbdd54 100755
--- a/releases/virtualbox/start-wekan.sh
+++ b/releases/virtualbox/start-wekan.sh
@@ -71,6 +71,8 @@
# 2) Configure the environment variables. This differs slightly
# by installation type, but make sure you have the following:
#export OAUTH2_ENABLED=true
+ # OAuth2 login style: popup or redirect.
+ #export OAUTH2_LOGIN_STYLE=redirect
# Application GUID captured during app registration:
#export OAUTH2_CLIENT_ID=xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx
# Secret key generated during app registration:
@@ -91,6 +93,8 @@
# ==== OAUTH2 KEYCLOAK ====
# https://github.com/wekan/wekan/wiki/Keycloak <== MAPPING INFO, REQUIRED
#export OAUTH2_ENABLED=true
+ # OAuth2 login style: popup or redirect.
+ #export OAUTH2_LOGIN_STYLE=redirect
#export OAUTH2_CLIENT_ID=<Keycloak create Client ID>
#export OAUTH2_SERVER_URL=<Keycloak server name>/auth
#export OAUTH2_AUTH_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/auth
@@ -99,11 +103,13 @@
#export OAUTH2_SECRET=<keycloak client secret>
#-----------------------------------------------------------------
# ==== OAUTH2 DOORKEEPER ====
+ # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
# https://github.com/wekan/wekan/issues/1874
# https://github.com/wekan/wekan/wiki/OAuth2
# Enable the OAuth2 connection
#export OAUTH2_ENABLED=true
- # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
+ # OAuth2 login style: popup or redirect.
+ #export OAUTH2_LOGIN_STYLE=redirect
# OAuth2 Client ID.
#export OAUTH2_CLIENT_ID=abcde12345
# OAuth2 Secret.
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index bddd161e..e42893f0 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 = 253,
+ appVersion = 254,
# Increment this for every release.
- appMarketingVersion = (defaultText = "2.51.0~2019-03-21"),
+ appMarketingVersion = (defaultText = "2.52.0~2019-03-22"),
# Human-readable presentation of the app version.
minUpgradableAppVersion = 0,
diff --git a/server/authentication.js b/server/authentication.js
index 4d3cc53e..5ca45b68 100644
--- a/server/authentication.js
+++ b/server/authentication.js
@@ -69,7 +69,7 @@ Meteor.startup(() => {
{ service: 'oidc' },
{
$set: {
- loginStyle: 'redirect',
+ loginStyle: process.env.OAUTH2_LOGIN_STYLE,
clientId: process.env.OAUTH2_CLIENT_ID,
secret: process.env.OAUTH2_SECRET,
serverUrl: process.env.OAUTH2_SERVER_URL,
diff --git a/server/rulesHelper.js b/server/rulesHelper.js
index 453c586d..83710057 100644
--- a/server/rulesHelper.js
+++ b/server/rulesHelper.js
@@ -67,15 +67,15 @@ RulesHelper = {
card.move(card.swimlaneId, listId, maxOrder + 1);
}
if(action.actionType === 'sendEmail'){
- const emailTo = action.emailTo;
- const emailMsg = action.emailMsg;
- const emailSubject = action.emailSubject;
+ const to = action.emailTo;
+ const text = action.emailMsg || '';
+ const subject = action.emailSubject || '';
try {
Email.send({
- emailTo,
+ to,
from: Accounts.emailTemplates.from,
- emailSubject,
- emailMsg,
+ subject,
+ text,
});
} catch (e) {
// eslint-disable-next-line no-console
diff --git a/snap-src/bin/config b/snap-src/bin/config
index 30e389c1..7d68e26d 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 MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API 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 EMAIL_NOTIFICATION_TIMEOUT CORS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED 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_EMAIL_MAP 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_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"
+keys="DEBUG MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API 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 EMAIL_NOTIFICATION_TIMEOUT CORS 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_EMAIL_MAP 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_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"
# default values
DESCRIPTION_DEBUG="Debug OIDC OAuth2 etc. Example: sudo snap set wekan debug='true'"
@@ -122,6 +122,10 @@ DESCRIPTION_OAUTH2_ENABLED="Enable the OAuth2 connection"
DEFAULT_OAUTH2_ENABLED="false"
KEY_OAUTH2_ENABLED="oauth2-enabled"
+DESCRIPTION_OAUTH2_LOGIN_STYLE="OAuth2 login style: popup or redirect. Default: redirect"
+DEFAULT_OAUTH2_LOGIN_STYLE="redirect"
+KEY_OAUTH2_LOGIN_STYLE="oauth2-login-style"
+
DESCRIPTION_OAUTH2_CLIENT_ID="OAuth2 Client ID, for example from Rocket.Chat. Example: abcde12345"
DEFAULT_OAUTH2_CLIENT_ID=""
KEY_OAUTH2_CLIENT_ID="oauth2-client-id"
diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help
index 55e4037b..d1eeaccd 100755
--- a/snap-src/bin/wekan-help
+++ b/snap-src/bin/wekan-help
@@ -94,6 +94,12 @@ echo -e "\t$ snap set $SNAP_NAME oauth2-client-id='54321abcde'"
echo -e "\t-Disable the OAuth2 Client ID of Wekan:"
echo -e "\t$ snap set $SNAP_NAME oauth2-client-id=''"
echo -e "\n"
+echo -e "OAuth2 login style: popup or redirect. Default: redirect"
+echo -e "To enable the OAuth2 login style popup of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-login-style='popup'"
+echo -e "\t-Disable the OAuth2 login style popup of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME oauth2-login-style='redirect'"
+echo -e "\n"
echo -e "OAuth2 Secret."
echo -e "To enable the OAuth2 Secret of Wekan:"
echo -e "\t$ snap set $SNAP_NAME oauth2-secret='54321abcde'"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 07c65e5a..2b4ab48b 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -115,7 +115,7 @@ parts:
# we temporary need api2html and mkdirp
npm install -g api2html
npm install -g mkdirp
- api2html -c ./public/wekan-logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml
+ api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml
npm uninstall -g mkdirp
npm uninstall -g api2html
# Node Fibers 100% CPU usage issue:
diff --git a/start-wekan.bat b/start-wekan.bat
index 6cf481c3..cd56af28 100755
--- a/start-wekan.bat
+++ b/start-wekan.bat
@@ -1,5 +1,12 @@
REM ------------------------------------------------------------
+REM NOTE: THIS .BAT DOES NOT WORK !!
+REM Use instead this webpage instructions to build on Windows:
+REM https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows
+REM Please add fix PRs, like config of MongoDB etc.
+
+REM ------------------------------------------------------------
+
REM # Debug OIDC OAuth2 etc.
REM SET DEBUG=true
diff --git a/start-wekan.sh b/start-wekan.sh
index a791944e..4e7f930c 100755
--- a/start-wekan.sh
+++ b/start-wekan.sh
@@ -89,6 +89,9 @@ function wekan_repo_check(){
# 2) Configure the environment variables. This differs slightly
# by installation type, but make sure you have the following:
#export OAUTH2_ENABLED=true
+ # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
+ # OAuth2 login style: popup or redirect.
+ #export OAUTH2_LOGIN_STYLE=redirect
# Application GUID captured during app registration:
#export OAUTH2_CLIENT_ID=xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx
# Secret key generated during app registration:
@@ -109,6 +112,8 @@ function wekan_repo_check(){
# ==== OAUTH2 KEYCLOAK ====
# https://github.com/wekan/wekan/wiki/Keycloak <== MAPPING INFO, REQUIRED
#export OAUTH2_ENABLED=true
+ # OAuth2 login style: popup or redirect.
+ #export OAUTH2_LOGIN_STYLE=redirect
#export OAUTH2_CLIENT_ID=<Keycloak create Client ID>
#export OAUTH2_SERVER_URL=<Keycloak server name>/auth
#export OAUTH2_AUTH_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/auth
@@ -117,11 +122,13 @@ function wekan_repo_check(){
#export OAUTH2_SECRET=<keycloak client secret>
#-----------------------------------------------------------------
# ==== OAUTH2 DOORKEEPER ====
+ # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
# https://github.com/wekan/wekan/issues/1874
# https://github.com/wekan/wekan/wiki/OAuth2
# Enable the OAuth2 connection
#export OAUTH2_ENABLED=true
- # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
+ # OAuth2 login style: popup or redirect.
+ #export OAUTH2_LOGIN_STYLE=redirect
# OAuth2 Client ID.
#export OAUTH2_CLIENT_ID=abcde12345
# OAuth2 Secret.