From 5cffcd7e1b7c59b4414b3bfaf7d87f800a893ffa Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 17 May 2019 09:35:40 +0800 Subject: [PATCH 1/3] Create LICENSE --- LICENSE | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..c606349b --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright (c) 2019, Marvin Zhang +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 42e27d8003c286e6fa3a887af9df00b5d3edbea6 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Tue, 21 May 2019 10:08:55 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 7d160185..eeea04bb 100644 --- a/README.md +++ b/README.md @@ -165,3 +165,7 @@ Crawlab is easy to use, general enough to adapt spiders in any language and any - [x] Multi-Language Support (中文) - [ ] Login & User Management - [ ] General Search + +If you like Crawlab or would like to contribute to it, please add the Author's Wechat noting "Crawlab" to enter the discussion group. + +![](https://user-gold-cdn.xitu.io/2019/3/15/169814cbd5e600e9?imageslim) From 5089db25c6d21168dcb1dafccb666b54f38597da Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Tue, 21 May 2019 10:11:17 +0800 Subject: [PATCH 3/3] Update README-zh.md --- README-zh.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README-zh.md b/README-zh.md index a4f19b13..42f850ac 100644 --- a/README-zh.md +++ b/README-zh.md @@ -164,8 +164,12 @@ Crawlab使用起来很方便,也很通用,可以适用于几乎任何主流 - [ ] 更多爬虫例子 ##### 前端 -- [ ] 任务数据统计 -- [ ] 表格过滤 +- [x] 任务数据统计 +- [x] 表格过滤 - [x] 多语言支持 (中文) - [ ] 登录和用户管理 - [ ] 全局搜索 + +如果您喜欢Crawlab或者希望贡献开发它,请加作者微信 tikazyq1 并注明"Crawlab",作者会将你拉入群。 + +![](https://user-gold-cdn.xitu.io/2019/3/15/169814cbd5e600e9?imageslim)