فهرست منبع

Merge branch 'Serubin-devel' into devel

Lauri Ojansivu 8 سال پیش
والد
کامیت
16366db2a5
6فایلهای تغییر یافته به همراه11 افزوده شده و 3 حذف شده
  1. 3 0
      .gitmodules
  2. 1 1
      .meteor/packages
  3. 2 1
      CHANGELOG.md
  4. 3 0
      app.env
  5. 1 1
      package.json
  6. 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/wekan/flow-router.git

+ 1 - 1
.meteor/packages

@@ -50,7 +50,6 @@ arillo:flow-router-helpers
 audit-argument-checks
 audit-argument-checks
 kadira:blaze-layout
 kadira:blaze-layout
 kadira:dochead
 kadira:dochead
-kadira:flow-router
 meteorhacks:fast-render
 meteorhacks:fast-render
 meteorhacks:picker
 meteorhacks:picker
 meteorhacks:subs-manager
 meteorhacks:subs-manager
@@ -76,3 +75,4 @@ templates:tabs
 verron:autosize
 verron:autosize
 simple:json-routes
 simple:json-routes
 rajit:bootstrap3-datepicker
 rajit:bootstrap3-datepicker
+kadira:flow-router

+ 2 - 1
CHANGELOG.md

@@ -7,10 +7,11 @@ Known bugs:
 
 
 This release fixes the following bugs:
 This release fixes the following bugs:
 
 
+* Double slash problem on card pop-ups;
 * No need for Array.prototype if using rest operator;
 * No need for Array.prototype if using rest operator;
 * Fix default font so Chinese is shown correctly.
 * 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.
 their contributions.
 
 
 # v0.16 2017-03-15 Wekan release
 # v0.16 2017-03-15 Wekan release

+ 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",
   "description": "The open-source Trello-like kanban",
   "private": true,
   "private": true,
   "scripts": {
   "scripts": {
-    "lint": "eslint .",
+    "lint": "eslint --ignore-pattern 'packages/*' .",
     "test": "npm run --silent lint"
     "test": "npm run --silent lint"
   },
   },
   "repository": {
   "repository": {

+ 1 - 0
packages/kadira:flow-router

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