git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-22 17:31:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
930 Commits 6 Branches 35 Tags
f8f4d561e960c4d4215fc7a80e07d140e538dfb2
Commit Graph

930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
陈景阳
f8f4d561e9 Merge remote-tracking branch 'upstream/develop' into upstream-develop 
# Conflicts:
#	backend/services/spider.go
 2019-11-26 15:30:26 +08:00
暗音
4f9d8635e5 Merge pull request #13 from crawlab-team/develop 
Develop
 2019-11-26 15:29:18 +08:00
陈景阳
fa4d8ddc50 fix 执行爬虫错误的问题 2019-11-26 15:26:01 +08:00
暗音
e228a05ed7 Merge pull request #12 from crawlab-team/master 
同步源库
 2019-11-26 14:36:14 +08:00
Marvin Zhang
e3cc5f33ff Update issue templates 2019-11-26 13:49:03 +08:00
marvzhang
a87950e369 加入环境变量 2019-11-25 22:07:20 +08:00
marvzhang
dccfb23901 加入储存逻辑 2019-11-25 17:52:19 +08:00
marvzhang
1c32c92c54 refactor code 2019-11-25 16:45:55 +08:00
marvzhang
3f12302cf9 更新可配置爬虫：添加上传GridFS 2019-11-25 13:36:14 +08:00
marvzhang
5a286f98af 更新可配置爬虫，修复一些问题 2019-11-24 19:45:21 +08:00
marvzhang
8b451c8b2b 更新可配置爬虫，修复一些问题 2019-11-24 18:51:32 +08:00
marvzhang
9c282ddb4d 加入可配置爬虫 2019-11-24 17:57:12 +08:00
marvzhang
6d9c2ce653 Merge remote-tracking branch 'origin/develop' into develop 2019-11-24 12:25:46 +08:00
marvzhang
7003951561 fixed https://github.com/crawlab-team/crawlab/issues/315 2019-11-24 12:20:44 +08:00
Marvin Zhang
f1c951d575 Merge pull request #313 from hantmac/develop 
bug fix
 2019-11-24 11:34:50 +08:00
marvzhang
7b86d35a0f code cleanup 2019-11-23 18:16:24 +08:00
marvzhang
607ce70f5c 准备可配置爬虫 2019-11-23 18:13:47 +08:00
marvzhang
010968a7ce Merge remote-tracking branch 'origin/develop' into develop 2019-11-23 16:48:19 +08:00
marvzhang
464054d1c2 added vendor files 2019-11-23 16:47:05 +08:00
韩山杰
d4525116ea modity redis DialWriteTimeout to 15s 2019-11-22 22:29:02 +08:00
韩山杰
86d4c611c6 bug fix 2019-11-22 15:32:23 +08:00
Marvin Zhang
c38b6c4f0e Merge pull request #309 from hantmac/develop 
bug fix register.go
 2019-11-19 17:20:50 +08:00
Jeremy
7755c3e74c bug fix register.go 
fix data race because of register solve issue https://github.com/crawlab-team/crawlab/issues/308
 2019-11-19 17:03:46 +08:00
marvzhang
3426180d75 Merge branch 'develop' of https://github.com/crawlab-team/crawlab into develop 2019-11-17 17:11:14 +08:00
marvzhang
275eb6ca85 updated jenkins 2019-11-17 17:10:51 +08:00
Marvin Zhang
6ef5f172a8 Merge pull request #300 from crawlab-team/master 
Update docker-compose.yml
 2019-11-11 09:51:20 +08:00
Marvin Zhang
75a3b7e8ee Merge pull request #298 from gs80140/master 
modify CRAWLAB_API_ADDRESS add http , without it will cause front can…
 2019-11-11 09:50:24 +08:00
gsong
7388be5dd1 modify CRAWLAB_API_ADDRESS add http , without it will cause front can't visit backend 2019-11-08 11:34:03 +08:00
Marvin Zhang
253edc2a30 Merge pull request #294 from coder-van/master 
任务日志ANSI格式化显示
 2019-11-06 20:29:35 +08:00
van
e8b468a708 add ansi-to-html dependence, show task log ansi with colors 2019-11-06 12:25:29 +08:00
陈景阳
cb0018ef87 关闭日志打印 2019-11-04 19:58:26 +08:00
Marvin Zhang
a391dda1a8 Merge pull request #292 from crawlab-team/develop 
Develop
 2019-11-01 13:12:14 +08:00
marvzhang
fb08ccdacf Merge branch 'develop' of https://github.com/crawlab-team/crawlab into develop 2019-11-01 13:11:18 +08:00
marvzhang
f1df74859a updated Jenkinsfile 2019-11-01 13:10:46 +08:00
Marvin Zhang
b39e6574db Merge pull request #291 from crawlab-team/develop 
Update README-zh.md
 2019-11-01 11:19:13 +08:00
Marvin Zhang
765d0717c4 Update README-zh.md 2019-11-01 11:18:50 +08:00
Marvin Zhang
6c8913e6fc Merge pull request #290 from crawlab-team/develop 
Update README.md
 2019-11-01 11:16:56 +08:00
Marvin Zhang
e2759ec426 Update README.md 2019-11-01 11:16:35 +08:00
暗音
83cd00bfe4 Merge pull request #10 from crawlab-team/master 
合并源库
 2019-10-29 19:20:45 +08:00
Marvin Zhang
c6da87e2b4 Merge pull request #284 from crawlab-team/develop 
Develop
v0.3.5 		2019-10-28 14:06:00 +08:00
暗音
6814b6b581 Merge pull request #283 from wo10378931/develop 
fix 循环依赖的问题
 2019-10-28 13:54:36 +08:00
陈景阳
9427283e3a fix 循环依赖的问题 2019-10-28 13:51:12 +08:00
Marvin Zhang
32f2323852 Merge pull request #282 from crawlab-team/develop 
Develop
 2019-10-28 12:38:23 +08:00
暗音
818d7143a7 Merge pull request #281 from wo10378931/develop 
fix 代码遗漏
 2019-10-28 12:37:02 +08:00
陈景阳
965553b285 fix 代码遗漏 2019-10-28 12:36:00 +08:00
Marvin Zhang
7b01e65029 Update CHANGELOG.md 2019-10-28 12:19:45 +08:00
Marvin Zhang
ba85c5312c Update CHANGELOG.md 2019-10-28 12:19:26 +08:00
Marvin Zhang
383d5e6135 Update CHANGELOG.md 2019-10-28 12:18:09 +08:00
Marvin Zhang
b9000473fe Merge pull request #280 from crawlab-team/master 
Merge CHANGELOG.md back to develop
 2019-10-28 12:12:53 +08:00
暗音
7c63686e50 Merge pull request #279 from wo10378931/develop 
fix 优化代码
 2019-10-28 12:04:01 +08:00