Commit Graph

5948 Commits

Author SHA1 Message Date
marvzhang
9c282ddb4d 加入可配置爬虫 2019-11-24 17:57:12 +08:00
marvzhang
38d103da39 加入可配置爬虫 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
c03c296436 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
marvzhang
442396a5ff 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
Marvin Zhang
966d3eaaf2 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
b51fa81b79 code cleanup 2019-11-23 18:16:24 +08:00
marvzhang
607ce70f5c 准备可配置爬虫 2019-11-23 18:13:47 +08:00
marvzhang
b5c3ca9c32 准备可配置爬虫 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
9311a37a55 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
marvzhang
2b26f7fa7e 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
韩山杰
6741873f20 modity redis DialWriteTimeout to 15s 2019-11-22 22:29:02 +08:00
韩山杰
86d4c611c6 bug fix 2019-11-22 15:32:23 +08:00
韩山杰
6c7d884e66 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
Marvin Zhang
835e004c9b 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
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
3426180d75 Merge branch 'develop' of https://github.com/crawlab-team/crawlab into develop 2019-11-17 17:11:14 +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
275eb6ca85 updated jenkins 2019-11-17 17:10:51 +08:00
marvzhang
4fcd2f5418 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
235d431b54 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
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
7388be5dd1 modify CRAWLAB_API_ADDRESS add http , without it will cause front can't visit backend 2019-11-08 11:34:03 +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
253edc2a30 Merge pull request #294 from coder-van/master
任务日志ANSI格式化显示
2019-11-06 20:29:35 +08:00
Marvin Zhang
0646b8a9f4 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
van
a237a0f144 add ansi-to-html dependence, show task log ansi with colors 2019-11-06 12:25:29 +08:00
暗音
180eb325d2 Merge pull request #11 from wo10378931/develop
Develop
2019-11-04 20:01:25 +08:00
暗音
352e4c886a Merge pull request #11 from wo10378931/develop
Develop
2019-11-04 20:01:25 +08:00
陈景阳
cb0018ef87 关闭日志打印 2019-11-04 19:58:26 +08:00
陈景阳
1339877b74 关闭日志打印 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
Marvin Zhang
df10a0da6b 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
96b95e5dce 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
marvzhang
54ac772d8c 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
85b5c372df Merge pull request #291 from crawlab-team/develop
Update README-zh.md
2019-11-01 11:19:13 +08:00