浏览代码

Merge branch 'devel' of https://github.com/Serubin/wekan into Serubin-devel

Lauri Ojansivu 8 年之前
父节点
当前提交
a9059201a7
共有 5 个文件被更改,包括 9 次插入2 次删除
  1. 3 0
      .gitmodules
  2. 1 1
      .meteor/packages
  3. 3 0
      app.env
  4. 1 1
      package.json
  5. 1 0
      packages/kadira:flow-router

+ 3 - 0
.gitmodules

@@ -0,0 +1,3 @@
+[submodule "packages/kadira:flow-router"]
+	path = packages/kadira:flow-router
+	url = https://github.com/Serubin/flow-router.git

+ 1 - 1
.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

+ 3 - 0
app.env

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+export PACKAGE_DIRS="$(pwd)/packages"

+ 1 - 1
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": {

+ 1 - 0
packages/kadira:flow-router

@@ -0,0 +1 @@
+Subproject commit da8154738eddfe43a639bd6b5f400518a4142db3