diff options
| -rw-r--r-- | .meteor/.finished-upgraders | 1 | ||||
| -rw-r--r-- | .meteor/packages | 33 | ||||
| -rw-r--r-- | .meteor/release | 2 | ||||
| -rw-r--r-- | .meteor/versions | 119 | ||||
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | docker-compose-build.yml | 219 | ||||
| -rw-r--r-- | docker-compose.yml | 17 | ||||
| -rw-r--r-- | i18n/pl.i18n.json | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 4 | ||||
| -rwxr-xr-x | snap-src/bin/config | 6 | ||||
| -rw-r--r-- | snapcraft.yaml | 2 |
13 files changed, 313 insertions, 105 deletions
diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders index 8f397c7d..2a56593d 100644 --- a/.meteor/.finished-upgraders +++ b/.meteor/.finished-upgraders @@ -16,4 +16,3 @@ notices-for-facebook-graph-api-2 1.4.1-add-shell-server-package 1.4.3-split-account-service-packages 1.5-add-dynamic-import-package -1.7-split-underscore-from-meteor-base diff --git a/.meteor/packages b/.meteor/packages index 65d54fd2..3779a684 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -3,18 +3,17 @@ # 'meteor add' and 'meteor remove' will edit this file for you, # but you can also edit it by hand. -meteor-base@1.4.0 +meteor-base@1.2.0 # Build system -ecmascript@0.12.0 +ecmascript stylus@2.513.13 -standard-minifier-css@1.5.0 -standard-minifier-js@2.4.0 +standard-minifier-css@1.3.5 +standard-minifier-js@2.2.0 mquandalle:jade -coffeescript@2.3.1_2! # Polyfills -es5-shim@4.8.0 +es5-shim@4.6.15 # Collections aldeed:collection2 @@ -24,7 +23,7 @@ dburles:collection-helpers idmontie:migrations matb33:collection-hooks matteodem:easy-search -mongo@1.6.0 +mongo@1.3.1 mquandalle:collection-mutations # Account system @@ -35,12 +34,12 @@ useraccounts:flow-routing salleman:accounts-oidc # Utilities -check@1.3.1 +check@1.2.5 jquery@1.11.10 -random@1.1.0 -reactive-dict@1.2.1 -session@1.1.8 -tracker@1.2.0 +random@1.0.10 +reactive-dict@1.2.0 +session@1.1.7 +tracker@1.1.3 underscore@1.0.10 3stack:presence alethes:pages @@ -54,7 +53,7 @@ mquandalle:autofocus ongoworks:speakingurl raix:handlebar-helpers tap:i18n -http@1.4.1 +http@1.3.0 # UI components blaze @@ -71,21 +70,21 @@ templates:tabs verron:autosize simple:json-routes rajit:bootstrap3-datepicker -shell-server@0.4.0 +shell-server@0.3.0 simple:rest-accounts-password useraccounts:core email@1.2.3 horka:swipebox -dynamic-import@0.5.0 +dynamic-import@0.2.0 staringatlights:fast-render mixmax:smart-disconnect -accounts-password@1.5.1 +accounts-password@1.5.0 cfs:gridfs eluck:accounts-lockout rzymek:fullcalendar momentjs:moment@2.22.2 -browser-policy-framing@1.1.0 +browser-policy-framing mquandalle:moment msavin:usercache wekan:wekan-ldap diff --git a/.meteor/release b/.meteor/release index 02806a3f..56a7a07f 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.8.1-beta.0 +METEOR@1.6.0.1 diff --git a/.meteor/versions b/.meteor/versions index 8d10ad73..6415eb8b 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,7 +1,7 @@ 3stack:presence@1.1.2 -accounts-base@1.4.3 -accounts-oauth@1.1.16 -accounts-password@1.5.1 +accounts-base@1.4.0 +accounts-oauth@1.1.15 +accounts-password@1.5.0 aldeed:collection2@2.10.0 aldeed:collection2-core@1.2.0 aldeed:schema-deny@1.1.0 @@ -11,19 +11,19 @@ alethes:pages@1.8.6 allow-deny@1.1.0 arillo:flow-router-helpers@0.5.2 audit-argument-checks@1.0.7 -autoupdate@1.5.0 -babel-compiler@7.2.0 -babel-runtime@1.3.0 -base64@1.0.11 -binary-heap@1.0.11 -blaze@2.3.3 +autoupdate@1.3.12 +babel-compiler@6.24.7 +babel-runtime@1.1.1 +base64@1.0.10 +binary-heap@1.0.10 +blaze@2.3.2 blaze-tools@1.0.10 -boilerplate-generator@1.6.0 +boilerplate-generator@1.3.1 browser-policy-common@1.0.11 browser-policy-framing@1.1.0 -caching-compiler@1.2.0 +caching-compiler@1.1.9 caching-html-compiler@1.1.2 -callback-hook@1.1.0 +callback-hook@1.0.10 cfs:access-point@0.1.49 cfs:base-package@0.0.30 cfs:collection@0.5.5 @@ -41,40 +41,38 @@ cfs:storage-adapter@0.2.3 cfs:tempstore@0.1.5 cfs:upload-http@0.0.20 cfs:worker@0.1.4 -check@1.3.1 +check@1.2.5 chuangbo:cookie@1.1.0 -coffeescript@2.3.1_2 -coffeescript-compiler@2.3.1_2 +coffeescript@1.12.7_3 +coffeescript-compiler@1.12.7_3 cottz:publish-relations@2.0.8 dburles:collection-helpers@1.1.0 ddp@1.4.0 -ddp-client@2.3.3 -ddp-common@1.4.0 +ddp-client@2.2.0 +ddp-common@1.3.0 ddp-rate-limiter@1.0.7 -ddp-server@2.2.0 +ddp-server@2.1.1 deps@1.0.12 -diff-sequence@1.1.0 -dynamic-import@0.5.0 -ecmascript@0.12.0 -ecmascript-runtime@0.7.0 -ecmascript-runtime-client@0.8.0 -ecmascript-runtime-server@0.7.1 +diff-sequence@1.0.7 +dynamic-import@0.2.1 +ecmascript@0.9.0 +ecmascript-runtime@0.5.0 +ecmascript-runtime-client@0.5.0 +ecmascript-runtime-server@0.5.0 ejson@1.1.0 eluck:accounts-lockout@0.9.0 email@1.2.3 -es5-shim@4.8.0 +es5-shim@4.6.15 fastclick@1.0.13 -fetch@0.1.0 fortawesome:fontawesome@4.7.0 geojson-utils@1.0.10 horka:swipebox@1.0.2 hot-code-push@1.0.4 html-tools@1.0.11 htmljs@1.0.11 -http@1.4.1 -id-map@1.1.0 +http@1.3.0 +id-map@1.0.9 idmontie:migrations@1.0.3 -inter-process-messaging@0.1.0 jquery@1.11.10 kadira:blaze-layout@2.3.0 kadira:dochead@1.5.0 @@ -83,12 +81,12 @@ kenton:accounts-sandstorm@0.7.0 launch-screen@1.1.1 livedata@1.0.18 localstorage@1.2.0 -logging@1.1.20 +logging@1.1.19 matb33:collection-hooks@0.8.4 matteodem:easy-search@1.6.4 mdg:validation-error@0.5.1 -meteor@1.9.2 -meteor-base@1.4.0 +meteor@1.8.2 +meteor-base@1.2.0 meteor-platform@1.2.6 meteorhacks:aggregate@1.3.0 meteorhacks:collection-utils@1.2.0 @@ -96,20 +94,18 @@ meteorhacks:meteorx@1.4.1 meteorhacks:picker@1.0.3 meteorhacks:subs-manager@1.6.4 meteorspark:util@0.2.0 -minifier-css@1.4.0 -minifier-js@2.4.0 +minifier-css@1.2.16 +minifier-js@2.2.2 minifiers@1.1.8-faster-rebuild.0 -minimongo@1.4.5 +minimongo@1.4.3 mixmax:smart-disconnect@0.0.4 mobile-status-bar@1.0.14 -modern-browsers@0.1.2 -modules@0.13.0 -modules-runtime@0.10.2 +modules@0.11.0 +modules-runtime@0.9.1 momentjs:moment@2.22.2 -mongo@1.6.0 -mongo-decimal@0.1.0 +mongo@1.3.1 mongo-dev-server@1.1.0 -mongo-id@1.0.7 +mongo-id@1.0.6 mongo-livedata@1.0.12 mousetrap:mousetrap@1.4.6_1 mquandalle:autofocus@1.0.0 @@ -123,48 +119,47 @@ mquandalle:mousetrap-bindglobal@0.0.1 mquandalle:perfect-scrollbar@0.6.5_2 msavin:usercache@1.0.0 npm-bcrypt@0.9.3 -npm-mongo@3.1.1 -oauth@1.2.3 -oauth2@1.2.1 +npm-mongo@2.2.33 +oauth@1.2.1 +oauth2@1.2.0 observe-sequence@1.0.16 ongoworks:speakingurl@1.1.0 -ordered-dict@1.1.0 +ordered-dict@1.0.9 peerlibrary:assert@0.2.5 peerlibrary:base-component@0.16.0 peerlibrary:blaze-components@0.15.1 -peerlibrary:computed-field@0.9.0 +peerlibrary:computed-field@0.7.0 peerlibrary:reactive-field@0.3.0 perak:markdown@1.0.5 -promise@0.11.1 +promise@0.10.0 raix:eventemitter@0.1.3 raix:handlebar-helpers@0.2.5 rajit:bootstrap3-datepicker@1.7.1 -random@1.1.0 -rate-limit@1.0.9 -reactive-dict@1.2.1 +random@1.0.10 +rate-limit@1.0.8 +reactive-dict@1.2.0 reactive-var@1.0.11 -reload@1.2.0 -retry@1.1.0 -routepolicy@1.1.0 +reload@1.1.11 +retry@1.0.9 +routepolicy@1.0.12 rzymek:fullcalendar@3.8.0 salleman:accounts-oidc@1.0.9 salleman:oidc@1.0.9 service-configuration@1.0.11 -session@1.1.8 +session@1.1.7 sha@1.0.9 -shell-server@0.4.0 +shell-server@0.3.1 simple:authenticate-user-by-token@1.0.1 simple:json-routes@2.1.0 simple:rest-accounts-password@1.1.2 simple:rest-bearer-token-parser@1.0.1 simple:rest-json-error-handler@1.0.1 -socket-stream-client@0.2.2 softwarerero:accounts-t9n@1.3.11 spacebars@1.0.15 spacebars-compiler@1.1.3 -srp@1.0.12 -standard-minifier-css@1.5.0 -standard-minifier-js@2.4.0 +srp@1.0.10 +standard-minifier-css@1.3.5 +standard-minifier-js@2.2.3 staringatlights:fast-render@2.16.5 staringatlights:inject-data@2.0.5 stylus@2.513.13 @@ -174,15 +169,15 @@ templating@1.3.2 templating-compiler@1.3.3 templating-runtime@1.3.2 templating-tools@1.1.2 -tracker@1.2.0 +tracker@1.1.3 ui@1.0.13 underscore@1.0.10 -url@1.2.0 +url@1.1.0 useraccounts:core@1.14.2 useraccounts:flow-routing@1.14.2 useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 -webapp@1.7.0 +webapp@1.4.0 webapp-hashing@1.0.9 wekan:accounts-cas@0.1.0 wekan:wekan-ldap@0.0.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index b4bab0ec..d40b8530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# v1.57 2018-10-23 Wekan release + +This release adds the following new features: + +- Merge edge into stable. This brings LDAP, Rules, Role "No Comments", etc. +- Go back to Meteor 1.6.x and MongoDB 3.2.21 that works in Snap etc. + +Thanks to GitHub user xet7 for contributions. + # v1.55.1 2018-10-16 Wekan Edge release This release adds the following new features: @@ -70,7 +70,7 @@ ARG LDAP_DEFAULT_DOMAIN # ENV BUILD_DEPS="paxctl" ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" \ NODE_VERSION=v8.12.0 \ - METEOR_RELEASE=1.8.1-beta.0 \ + METEOR_RELEASE=1.6.0.1 \ USE_EDGE=false \ METEOR_EDGE=1.5-beta.17 \ NPM_VERSION=latest \ diff --git a/docker-compose-build.yml b/docker-compose-build.yml new file mode 100644 index 00000000..b35d501a --- /dev/null +++ b/docker-compose-build.yml @@ -0,0 +1,219 @@ +version: '2' + +# Using prebuilt image: docker-compose up -d --no-build + +services: + + wekandb: + image: mongo:3.2.21 + container_name: wekan-db + restart: always + command: mongod --smallfiles --oplogSize 128 + networks: + - wekan-tier + expose: + - 27017 + volumes: + - wekan-db:/data/db + - wekan-db-dump:/dump + + wekan: + image: quay.io/wekan/wekan + container_name: wekan-app + restart: always + networks: + - wekan-tier + build: + context: . + dockerfile: Dockerfile + args: + - NODE_VERSION=${NODE_VERSION} + - METEOR_RELEASE=${METEOR_RELEASE} + - NPM_VERSION=${NPM_VERSION} + - ARCHITECTURE=${ARCHITECTURE} + - SRC_PATH=${SRC_PATH} + - METEOR_EDGE=${METEOR_EDGE} + - USE_EDGE=${USE_EDGE} + ports: + # Docker outsideport:insideport + - 80:8080 + environment: + - MONGO_URL=mongodb://wekandb:27017/wekan + - ROOT_URL=http://localhost + # Wekan Export Board works when WITH_API='true'. + # If you disable Wekan API with 'false', Export Board does not work. + - WITH_API=true + # Optional: Integration with Matomo https://matomo.org that is installed to your server + # The address of the server where Matomo is hosted. + # example: - MATOMO_ADDRESS=https://example.com/matomo + - MATOMO_ADDRESS='' + # The value of the site ID given in Matomo server for Wekan + # example: - MATOMO_SITE_ID=12345 + - MATOMO_SITE_ID='' + # The option do not track which enables users to not be tracked by matomo + # example: - MATOMO_DO_NOT_TRACK=false + - MATOMO_DO_NOT_TRACK=true + # The option that allows matomo to retrieve the username: + # example: MATOMO_WITH_USERNAME=true + - MATOMO_WITH_USERNAME=false + # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside. + # Setting this to false is not recommended, it also disables all other browser policy protections + # and allows all iframing etc. See wekan/server/policy.js + - BROWSER_POLICY_ENABLED=true + # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside. + - TRUSTED_URL='' + # What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId . + # example: WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId + - WEBHOOKS_ATTRIBUTES='' + # Enable the OAuth2 connection + # example: OAUTH2_ENABLED=true + - OAUTH2_ENABLED=false + # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2 + # OAuth2 Client ID, for example from Rocket.Chat. Example: abcde12345 + # example: OAUTH2_CLIENT_ID=abcde12345 + - OAUTH2_CLIENT_ID='' + # OAuth2 Secret, for example from Rocket.Chat: Example: 54321abcde + # example: OAUTH2_SECRET=54321abcde + - OAUTH2_SECRET='' + # OAuth2 Server URL, for example Rocket.Chat. Example: https://chat.example.com + # example: OAUTH2_SERVER_URL=https://chat.example.com + - OAUTH2_SERVER_URL='' + # OAuth2 Authorization Endpoint. Example: /oauth/authorize + # example: OAUTH2_AUTH_ENDPOINT=/oauth/authorize + - OAUTH2_AUTH_ENDPOINT='' + # OAuth2 Userinfo Endpoint. Example: /oauth/userinfo + # example: OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo + - OAUTH2_USERINFO_ENDPOINT='' + # OAuth2 Token Endpoint. Example: /oauth/token + # example: OAUTH2_TOKEN_ENDPOINT=/oauth/token + - OAUTH2_TOKEN_ENDPOINT='' + # LDAP_ENABLE : Enable or not the connection by the LDAP + # example : LDAP_ENABLE=true + - LDAP_ENABLE=false + # LDAP_PORT : The port of the LDAP server + # example : LDAP_PORT=389 + - LDAP_PORT=389 + # LDAP_HOST : The host server for the LDAP server + # example : LDAP_HOST=localhost + - LDAP_HOST='' + # LDAP_BASEDN : The base DN for the LDAP Tree + # example : LDAP_BASEDN=ou=user,dc=example,dc=org + - LDAP_BASEDN='' + # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method + # example : LDAP_LOGIN_FALLBACK=true + - LDAP_LOGIN_FALLBACK=false + # LDAP_RECONNECT : Reconnect to the server if the connection is lost + # example : LDAP_RECONNECT=false + - LDAP_RECONNECT=true + # LDAP_TIMEOUT : Overall timeout, in milliseconds + # example : LDAP_TIMEOUT=12345 + - LDAP_TIMEOUT=10000 + # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds + # example : LDAP_IDLE_TIMEOUT=12345 + - LDAP_IDLE_TIMEOUT=10000 + # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds + # example : LDAP_CONNECT_TIMEOUT=12345 + - LDAP_CONNECT_TIMEOUT=10000 + # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search + # example : LDAP_AUTHENTIFICATION=true + - LDAP_AUTHENTIFICATION=false + # LDAP_AUTHENTIFICATION_USERDN : The search user DN + # example : LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org + - LDAP_AUTHENTIFICATION_USERDN='' + # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user + # example : AUTHENTIFICATION_PASSWORD=admin + - LDAP_AUTHENTIFICATION_PASSWORD='' + # LDAP_LOG_ENABLED : Enable logs for the module + # example : LDAP_LOG_ENABLED=true + - LDAP_LOG_ENABLED=false + # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background + # example : LDAP_BACKGROUND_SYNC=true + - LDAP_BACKGROUND_SYNC=false + # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds + # example : LDAP_BACKGROUND_SYNC_INTERVAL=12345 + - 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=true + - LDAP_ENCRYPTION=false + # LDAP_CA_CERT : The certification for the LDAPS server + # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE----- + - LDAP_CA_CERT='' + # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate + # example : LDAP_REJECT_UNAUTHORIZED=true + - 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= + - 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 subtree (search the whole subtree) + # example : LDAP_USER_SEARCH_SCOPE=one + - LDAP_USER_SEARCH_SCOPE='' + # LDAP_USER_SEARCH_FIELD : Which field is used to find the user + # example : LDAP_USER_SEARCH_FIELD=uid + - LDAP_USER_SEARCH_FIELD='' + # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited) + # example : LDAP_SEARCH_PAGE_SIZE=12345 + - LDAP_SEARCH_PAGE_SIZE=0 + # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited) + # example : LDAP_SEARCH_SIZE_LIMIT=12345 + - LDAP_SEARCH_SIZE_LIMIT=0 + # LDAP_GROUP_FILTER_ENABLE : Enable group filtering + # example : LDAP_GROUP_FILTER_ENABLE=true + - LDAP_GROUP_FILTER_ENABLE=false + # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering + # example : LDAP_GROUP_FILTER_OBJECTCLASS=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='' + # 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_MERGE_EXISTING_USERS : + # example : LDAP_MERGE_EXISTING_USERS=true + - LDAP_MERGE_EXISTING_USERS=false + # 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_GROUP_ROLES : + # example : + - 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 + # example : + - LDAP_DEFAULT_DOMAIN='' + + depends_on: + - wekandb + +volumes: + wekan-db: + driver: local + wekan-db-dump: + driver: local + +networks: + wekan-tier: + driver: bridge diff --git a/docker-compose.yml b/docker-compose.yml index a2228dac..e3b0c020 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,9 @@ version: '2' -# Using prebuilt image: docker-compose up -d --no-build - services: wekandb: - image: mongo:4.0.3 + image: mongo:3.2.21 container_name: wekan-db restart: always command: mongod --smallfiles --oplogSize 128 @@ -18,22 +16,11 @@ services: - wekan-db-dump:/dump wekan: - image: quay.io/wekan/wekan:edge + image: quay.io/wekan/wekan container_name: wekan-app restart: always networks: - wekan-tier - build: - context: . - dockerfile: Dockerfile - args: - - NODE_VERSION=${NODE_VERSION} - - METEOR_RELEASE=${METEOR_RELEASE} - - NPM_VERSION=${NPM_VERSION} - - ARCHITECTURE=${ARCHITECTURE} - - SRC_PATH=${SRC_PATH} - - METEOR_EDGE=${METEOR_EDGE} - - USE_EDGE=${USE_EDGE} ports: # Docker outsideport:insideport - 80:8080 diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 87b8537c..a067533f 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -18,7 +18,7 @@ "act-importBoard": "zaimportowano __board__", "act-importCard": "zaimportowano __card__", "act-importList": "zaimportowano __list__", - "act-joinMember": "dodał(a) __member_ do __card__", + "act-joinMember": "dodał(a) __member__ do __card__", "act-moveCard": "przeniósł/przeniosła __card__ z __oldList__ do __list__", "act-removeBoardMember": "usunął/usunęła __member__ z __board__", "act-restoredCard": "przywrócono __card__ do __board__", diff --git a/package.json b/package.json index 7bea1112..4325fb95 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v1.55.1", + "version": "v1.57.0", "description": "The open-source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 4c38b6f7..15ccf44d 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 = 156, + appVersion = 158, # Increment this for every release. - appMarketingVersion = (defaultText = "1.55.1~2018-10-16"), + appMarketingVersion = (defaultText = "1.57.0~2018-10-23"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snap-src/bin/config b/snap-src/bin/config index b81925ac..44d30baa 100755 --- a/snap-src/bin/config +++ b/snap-src/bin/config @@ -9,15 +9,15 @@ keys="MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM R DESCRIPTION_MONGODB_BIND_UNIX_SOCKET="mongodb binding unix socket:\n"\ "\t\t\t Default behaviour will preffer binding over unix socket, to disable unix socket binding set value to 'nill' string\n"\ "\t\t\t To bind to instance of mongodb provided through content interface,set value to relative path to the socket inside '$SNAP_DATA/shared' directory" -DEFAULT_MONGODB_BIND_UNIX_SOCKET="$SNAP_DATA/share" +DEFAULT_MONGODB_BIND_UNIX_SOCKET="/var/snap/wekan/current/share" KEY_MONGODB_BIND_UNIX_SOCKET="mongodb-bind-unix-socket" DESCRIPTION_MONGODB_PORT="mongodb binding port: eg 27017 when using localhost" -DEFAULT_MONGODB_PORT="" +DEFAULT_MONGODB_PORT="27019" KEY_MONGODB_PORT='mongodb-port' DESCRIPTION_MONGODB_BIND_IP="mongodb binding ip address: eg 127.0.0.1 for localhost\n\t\tIf not defined default unix socket is used instead" -DEFAULT_MONGODB_BIND_IP="" +DEFAULT_MONGODB_BIND_IP="127.0.0.1" KEY_MONGODB_BIND_IP="mongodb-bind-ip" DESCRIPTION_MAIL_URL="wekan mail binding" diff --git a/snapcraft.yaml b/snapcraft.yaml index 9ad94fe5..8ab977c5 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -65,7 +65,7 @@ apps: parts: mongodb: - source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-4.0.3.tgz + source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.21.tgz plugin: dump stage-packages: [libssl1.0.0] filesets: |