diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-03-24 21:00:18 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-03-24 21:00:18 +0200 |
commit | 16366db2a55e62b45089ea5682639f1fca3cb8d8 (patch) | |
tree | 04619f643f532a7ad3119c81c4f0a503e9a764dc | |
parent | cfc2175765c6740191aebd482e3bc358d868c811 (diff) | |
parent | 2031d107c432d340442dc12560902a9c1bedd02c (diff) | |
download | wekan-16366db2a55e62b45089ea5682639f1fca3cb8d8.tar.gz wekan-16366db2a55e62b45089ea5682639f1fca3cb8d8.tar.bz2 wekan-16366db2a55e62b45089ea5682639f1fca3cb8d8.zip |
Merge branch 'Serubin-devel' into devel
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | .meteor/packages | 2 | ||||
-rw-r--r-- | CHANGELOG.md | 3 | ||||
-rwxr-xr-x | app.env | 3 | ||||
-rw-r--r-- | package.json | 2 | ||||
m--------- | packages/kadira:flow-router | 0 |
6 files changed, 10 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..3db61f5f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "packages/kadira:flow-router"] + path = packages/kadira:flow-router + url = https://github.com/wekan/flow-router.git diff --git a/.meteor/packages b/.meteor/packages index 32d7389c..7ede4008 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -50,7 +50,6 @@ arillo:flow-router-helpers audit-argument-checks kadira:blaze-layout kadira:dochead -kadira:flow-router meteorhacks:fast-render meteorhacks:picker meteorhacks:subs-manager @@ -76,3 +75,4 @@ templates:tabs verron:autosize simple:json-routes rajit:bootstrap3-datepicker +kadira:flow-router diff --git a/CHANGELOG.md b/CHANGELOG.md index a014c098..e2adb13e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,11 @@ Known bugs: This release fixes the following bugs: +* Double slash problem on card pop-ups; * No need for Array.prototype if using rest operator; * Fix default font so Chinese is shown correctly. -Thanks to GitHub users mo-han and vuxor for +Thanks to GitHub users mo-han, Serubin and vuxor for their contributions. # v0.16 2017-03-15 Wekan release diff --git a/app.env b/app.env new file mode 100755 index 00000000..b047d258 --- /dev/null +++ b/app.env @@ -0,0 +1,3 @@ +#!/bin/bash + +export PACKAGE_DIRS="$(pwd)/packages" diff --git a/package.json b/package.json index 78b84ea8..fa8fb9d3 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "The open-source Trello-like kanban", "private": true, "scripts": { - "lint": "eslint .", + "lint": "eslint --ignore-pattern 'packages/*' .", "test": "npm run --silent lint" }, "repository": { diff --git a/packages/kadira:flow-router b/packages/kadira:flow-router new file mode 160000 +Subproject da8154738eddfe43a639bd6b5f400518a4142db |