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

917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marvzhang
38d103da39 加入可配置爬虫 2019-11-24 17:57:12 +08:00
marvzhang
c03c296436 Merge remote-tracking branch 'origin/develop' into develop 2019-11-24 12:25:46 +08:00
marvzhang
442396a5ff fixed https://github.com/crawlab-team/crawlab/issues/315 2019-11-24 12:20:44 +08:00
Marvin Zhang
966d3eaaf2 Merge pull request #313 from hantmac/develop 
bug fix
 2019-11-24 11:34:50 +08:00
marvzhang
b51fa81b79 code cleanup 2019-11-23 18:16:24 +08:00
marvzhang
b5c3ca9c32 准备可配置爬虫 2019-11-23 18:13:47 +08:00
marvzhang
9311a37a55 Merge remote-tracking branch 'origin/develop' into develop 2019-11-23 16:48:19 +08:00
marvzhang
2b26f7fa7e added vendor files 2019-11-23 16:47:05 +08:00
韩山杰
6741873f20 modity redis DialWriteTimeout to 15s 2019-11-22 22:29:02 +08:00
韩山杰
6c7d884e66 bug fix 2019-11-22 15:32:23 +08:00
Marvin Zhang
835e004c9b Merge pull request #309 from hantmac/develop 
bug fix register.go
 2019-11-19 17:20:50 +08:00
Jeremy
7e406261c2 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
dee3628ffa Merge branch 'develop' of https://github.com/crawlab-team/crawlab into develop 2019-11-17 17:11:14 +08:00
marvzhang
4fcd2f5418 updated jenkins 2019-11-17 17:10:51 +08:00
Marvin Zhang
235d431b54 Merge pull request #300 from crawlab-team/master 
Update docker-compose.yml
 2019-11-11 09:51:20 +08:00
Marvin Zhang
9dfef2f7a4 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
f550870f23 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
0646b8a9f4 Merge pull request #294 from coder-van/master 
任务日志ANSI格式化显示
 2019-11-06 20:29:35 +08:00
van
a237a0f144 add ansi-to-html dependence, show task log ansi with colors 2019-11-06 12:25:29 +08:00
Marvin Zhang
df10a0da6b Merge pull request #292 from crawlab-team/develop 
Develop
 2019-11-01 13:12:14 +08:00
marvzhang
96b95e5dce Merge branch 'develop' of https://github.com/crawlab-team/crawlab into develop 2019-11-01 13:11:18 +08:00
marvzhang
54ac772d8c updated Jenkinsfile 2019-11-01 13:10:46 +08:00
Marvin Zhang
85b5c372df Merge pull request #291 from crawlab-team/develop 
Update README-zh.md
 2019-11-01 11:19:13 +08:00
Marvin Zhang
33558834d2 Update README-zh.md 2019-11-01 11:18:50 +08:00
Marvin Zhang
e489d80095 Merge pull request #290 from crawlab-team/develop 
Update README.md
 2019-11-01 11:16:56 +08:00
Marvin Zhang
cc4fac45ca Update README.md 2019-11-01 11:16:35 +08:00
Marvin Zhang
ba1b70cee6 Merge pull request #284 from crawlab-team/develop 
Develop
 2019-10-28 14:06:00 +08:00
暗音
06e6e23573 Merge pull request #283 from wo10378931/develop 
fix 循环依赖的问题
 2019-10-28 13:54:36 +08:00
陈景阳
7a5fd69949 fix 循环依赖的问题 2019-10-28 13:51:12 +08:00
Marvin Zhang
2b17ebe5de Merge pull request #282 from crawlab-team/develop 
Develop
 2019-10-28 12:38:23 +08:00
暗音
1a081cfe0d Merge pull request #281 from wo10378931/develop 
fix 代码遗漏
 2019-10-28 12:37:02 +08:00
陈景阳
070242c5a2 fix 代码遗漏 2019-10-28 12:36:00 +08:00
Marvin Zhang
7786d69e80 Update CHANGELOG.md 2019-10-28 12:19:45 +08:00
Marvin Zhang
03961a0a0d Update CHANGELOG.md 2019-10-28 12:19:26 +08:00
Marvin Zhang
28b8a7f221 Update CHANGELOG.md 2019-10-28 12:18:09 +08:00
Marvin Zhang
1d9b0dc5ac Merge pull request #280 from crawlab-team/master 
Merge CHANGELOG.md back to develop
 2019-10-28 12:12:53 +08:00
暗音
82a81c6b08 Merge pull request #279 from wo10378931/develop 
fix 优化代码
 2019-10-28 12:04:01 +08:00
陈景阳
484a7ec17c fix 优化代码 2019-10-28 12:03:02 +08:00
Marvin Zhang
c9663aab7a Update CHANGELOG.md 2019-10-28 11:43:05 +08:00
暗音
45da42e921 Merge pull request #278 from wo10378931/develop 
读取日志修改为2M
 2019-10-28 11:41:56 +08:00
陈景阳
0648dacf4b 读取日志修改为2M 2019-10-28 11:38:39 +08:00
暗音
16f11fa9ae Merge pull request #277 from wo10378931/develop 
Develop
 2019-10-28 11:34:10 +08:00
陈景阳
b1283b315c Merge remote-tracking branch 'upstream/develop' into upstream-develop 2019-10-28 11:33:02 +08:00
陈景阳
abe83c10ee 修改版本号 2019-10-28 11:32:36 +08:00
Marvin Zhang
43763096d8 Merge pull request #276 from crawlab-team/develop 
Develop
 2019-10-28 11:26:45 +08:00
暗音
0f2988fc87 Merge pull request #275 from wo10378931/develop 
Merge pull request #9 from crawlab-team/develop
 2019-10-28 11:07:38 +08:00
暗音
d9e2ec5ed9 Merge pull request #9 from crawlab-team/develop 
Develop
 2019-10-28 11:06:21 +08:00
暗音
3937cba64f Merge branch 'develop' into develop 2019-10-28 11:06:13 +08:00
Marvin Zhang
d69000ef42 Merge pull request #268 from haivp3010/fix-env-var-replacement 
Fix environment variable replacement for CRAWLAB_API_ADDRESS
 2019-10-21 09:52:48 +08:00
Hai Nguyen
2685d712c9 Fix environment variable replacement for CRAWLAB_API_ADDRESS 2019-10-21 08:27:22 +07:00