diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-03-24 20:41:40 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-03-24 20:41:40 +0200 |
| commit | a9059201a7e5a94e86860e6c2da935a24e6f2be5 (patch) | |
| tree | 38aaebf0fac70a99c6f53ae35972e43ca6f24455 | |
| parent | cfc2175765c6740191aebd482e3bc358d868c811 (diff) | |
| parent | e088159c2f539e6dc6114658d7fef02d719145f3 (diff) | |
| download | wekan-a9059201a7e5a94e86860e6c2da935a24e6f2be5.tar.gz wekan-a9059201a7e5a94e86860e6c2da935a24e6f2be5.tar.bz2 wekan-a9059201a7e5a94e86860e6c2da935a24e6f2be5.zip | |
Merge branch 'devel' of https://github.com/Serubin/wekan into Serubin-devel
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | .meteor/packages | 2 | ||||
| -rwxr-xr-x | app.env | 3 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| m--------- | packages/kadira:flow-router | 0 |
5 files changed, 8 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..20461071 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "packages/kadira:flow-router"] + path = packages/kadira:flow-router + url = https://github.com/Serubin/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/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 |