summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-02-09 00:06:05 +0200
committerLauri Ojansivu <x@xet7.org>2019-02-09 00:06:05 +0200
commitf69392566a4eb57cfb6c82514d75cbb32b40ccc7 (patch)
treea7fe8b13af4cb1b08d7ebaf46f8439d37750080b
parent8e3689a11dd8b6b4cca7c48528ff3a78d1e9c1df (diff)
parented8bca5394d5ce295b96965da982bd2df1051379 (diff)
downloadwekan-f69392566a4eb57cfb6c82514d75cbb32b40ccc7.tar.gz
wekan-f69392566a4eb57cfb6c82514d75cbb32b40ccc7.tar.bz2
wekan-f69392566a4eb57cfb6c82514d75cbb32b40ccc7.zip
Merge branch 'edge' into meteor-1.8
-rw-r--r--CHANGELOG.md8
-rw-r--r--Stackerfile.yml2
-rw-r--r--i18n/es.i18n.json4
-rw-r--r--package.json2
-rw-r--r--sandstorm-pkgdef.capnp4
-rwxr-xr-xsnap-src/bin/mongodb-control2
6 files changed, 15 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24d43051..36dbf020 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v2.19 2019-02-09 Wekan release
+
+This release removes the following new features:
+
+- [Remove oplog from snap](https://github.com/wekan/wekan/commit/f1bd36a3b87f97927dfe60572646a457e1f7ef66). Need to think how to do it properly.
+
+Thanks to GitHub user xet7 for conrtibutions.
+
# v2.18 2019-02-08 Wekan release
This release adds the folloging new features:
diff --git a/Stackerfile.yml b/Stackerfile.yml
index a9191c64..5e9c9829 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.18.0"
+appVersion: "v2.19.0"
files:
userUploads:
- README.md
diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json
index d455b322..79f45124 100644
--- a/i18n/es.i18n.json
+++ b/i18n/es.i18n.json
@@ -660,6 +660,6 @@
"add-custom-html-before-body-end": "Añade HTML personalizado después de </body>",
"error-undefined": "Algo no está bien",
"error-ldap-login": "Ocurrió un error al intentar acceder",
- "display-authentication-method": "Visualizar método de autentificación",
- "default-authentication-method": "Método de autentificación por defecto"
+ "display-authentication-method": "Mostrar el método de autenticación",
+ "default-authentication-method": "Método de autenticación por defecto"
} \ No newline at end of file
diff --git a/package.json b/package.json
index 6a3d9315..869a9f3e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wekan",
- "version": "v2.18.0",
+ "version": "v2.19.0",
"description": "Open-Source kanban",
"private": true,
"scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index f076b58e..d0d0fb6e 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 = 220,
+ appVersion = 221,
# Increment this for every release.
- appMarketingVersion = (defaultText = "2.18.0~2019-02-08"),
+ appMarketingVersion = (defaultText = "2.19.0~2019-02-09"),
# Human-readable presentation of the app version.
minUpgradableAppVersion = 0,
diff --git a/snap-src/bin/mongodb-control b/snap-src/bin/mongodb-control
index 2154a602..d6d795bc 100755
--- a/snap-src/bin/mongodb-control
+++ b/snap-src/bin/mongodb-control
@@ -29,4 +29,4 @@ if [ "x" != "x${MONGODB_PORT}" ]; then
fi
echo "mongodb bind options: $BIND_OPTIONS"
-mongod --dbpath $SNAP_COMMON --logpath $SNAP_COMMON/mongodb.log --logappend --journal $BIND_OPTIONS --smallfiles --oplogSize 128
+mongod --dbpath $SNAP_COMMON --logpath $SNAP_COMMON/mongodb.log --logappend --journal $BIND_OPTIONS --smallfiles