Commit Graph

704 Commits

Author SHA1 Message Date
陈景阳
771cb76277 fix 前端控制台报错的问题 \
fix 无法打印中文的问题
2019-08-31 12:04:12 +08:00
陈景阳
369ef02fc7 fix #184 2019-08-31 10:08:37 +08:00
陈景阳
d5dce56712 Merge branch 'develop' of https://github.com/crawlab-team/crawlab into v0.4.0 2019-08-28 16:00:27 +08:00
陈景阳
cae11e3796 添加打印日志 2019-08-28 16:00:09 +08:00
Marvin Zhang
8efc90353e Merge pull request #179 from hantmac/master
bug fix: fix test failed for config.go
2019-08-27 14:24:23 +08:00
hantmac
36eaad64a5 bug fix: fix test failed for config.go 2019-08-27 14:21:39 +08:00
陈景阳
c7e137a6aa 删除爬虫顺带删除文件 2019-08-27 09:39:16 +08:00
Marvin Zhang
9bd7c6670f Merge pull request #176 from yaziming/forked/develop
JSON -> AbortWithStatusJSON
2019-08-27 08:45:49 +08:00
yaziming
ba0471355b JSON -> AbortWithStatusJSON 2019-08-26 23:13:26 +08:00
Marvin Zhang
40fd77be13 Merge pull request #175 from hantmac/master
add unit test for routes/spider.go
2019-08-26 22:16:06 +08:00
hantmac
5e707adad4 add unit test for routes/spider.go 2019-08-26 21:10:55 +08:00
陈景阳
986a88e264 Merge branch 'master' of https://github.com/crawlab-team/crawlab into v0.4.0 2019-08-26 20:36:18 +08:00
Marvin Zhang
489f53842f Merge pull request #173 from hantmac/master
bug fix:fix permission bug when create spiders dir caused by umask
2019-08-26 18:25:28 +08:00
hantmac
007f10b83b bug fix:fix permission bug when create spiders dir caused by umask 2019-08-26 17:44:01 +08:00
Marvin Zhang
91a313c7e2 Merge pull request #170 from hantmac/master
hot fix:fix redis lose connection problem
2019-08-26 10:44:57 +08:00
hantmac
1507e6724b hot fix:fix redis lose connection problem 2019-08-26 10:38:40 +08:00
Marvin Zhang
8aa32c1c79 Merge pull request #169 from crawlab-team/develop
Develop
v0.3.1
2019-08-25 10:29:53 +08:00
Marvin Zhang
28607a0890 updated CHANGELOG.md 2019-08-25 10:29:25 +08:00
Marvin Zhang
c86b6aebfe updated Dockerfile.frontend.alpine 2019-08-24 22:01:23 +08:00
陈景阳
faac001663 Merge branch 'master' of https://github.com/crawlab-team/crawlab into v0.4.0 2019-08-24 17:40:03 +08:00
Marvin Zhang
cab2be4842 Merge pull request #168 from crawlab-team/develop
Develop
2019-08-24 17:30:14 +08:00
Marvin Zhang
0c93e6a190 updated Jenkinsfile 2019-08-24 17:28:23 +08:00
Marvin Zhang
e43b765ec4 Merge remote-tracking branch 'origin/develop' into develop 2019-08-24 17:15:00 +08:00
Marvin Zhang
f6069a74fa added language switch on login page 2019-08-24 16:56:08 +08:00
Marvin Zhang
275206f61b Merge pull request #167 from hantmac/develop
remove redundant code
2019-08-24 16:23:28 +08:00
hantmac
561a9d260b remove redundant code 2019-08-24 15:50:53 +08:00
陈景阳
df46156305 Merge branch 'develop' of https://github.com/crawlab-team/crawlab into v0.4.0 2019-08-24 15:25:05 +08:00
Marvin Zhang
5bb727e808 Merge pull request #166 from hantmac/develop
bug fix: fix redis connection dead cycle
2019-08-24 15:21:59 +08:00
hantmac
3f249c8c61 bug fix:fix redis connection dead cycle 2019-08-24 15:16:27 +08:00
陈景阳
ce8fb86700 添加注释 2019-08-24 15:11:52 +08:00
Marvin Zhang
a549024342 Merge pull request #165 from wo10378931/master
优化前端UI
2019-08-24 14:59:30 +08:00
陈景阳
c1259f2e13 前端UI优化 2019-08-24 14:14:08 +08:00
Marvin Zhang
dcaf2ae2db Merge pull request #164 from hantmac/develop
Add unit test for task.go
2019-08-24 13:41:04 +08:00
hantmac
2c0ac66cb1 Add unit test for task.go 2019-08-24 13:39:06 +08:00
Marvin Zhang
84a9d0319d Merge pull request #163 from crawlab-team/develop
Develop
2019-08-24 13:14:45 +08:00
Marvin Zhang
b4792680df updated README 2019-08-24 13:12:15 +08:00
Marvin Zhang
efb5a653c8 updated README 2019-08-24 13:09:20 +08:00
Marvin Zhang
465e4d6dd1 Merge branch 'develop' of github.com:tikazyq/crawlab into develop 2019-08-24 12:53:13 +08:00
Marvin Zhang
c41ef5105f updated Jenkinsfile 2019-08-24 12:53:00 +08:00
Marvin Zhang
c772e801ce Merge pull request #162 from hantmac/develop
unit test for stats.go
2019-08-23 20:52:24 +08:00
陈景阳
266c3ba3e8 优化一点前端的UI 2019-08-23 20:39:14 +08:00
hantmac
44e98a56a3 unit test for stats.go 2019-08-23 20:28:11 +08:00
Marvin Zhang
3c308681d4 Merge pull request #160 from tikazyq/develop
Develop
2019-08-22 19:29:52 +08:00
Marvin Zhang
7ed9238043 updated Jenkinsfile 2019-08-22 19:29:17 +08:00
Marvin Zhang
67959f40a0 Merge branch 'develop' of github.com:tikazyq/crawlab into develop 2019-08-22 19:28:26 +08:00
Marvin Zhang
54fa4ac81e updated README 2019-08-22 19:26:57 +08:00
Marvin Zhang
00a61ed7dc Merge pull request #158 from hantmac/develop
modify unit test to use mock
2019-08-22 17:39:19 +08:00
hantmac
87f1cebc3b modify unit test to use mock 2019-08-22 16:20:30 +08:00
Marvin Zhang
a7bb03e5eb Merge pull request #154 from wo10378931/master
update 节点注册使用独立的key字段,而不是使用mac字段
2019-08-21 15:09:29 +08:00
陈景阳
1417b5c0c4 Merge branch 'master' of https://github.com/tikazyq/crawlab 2019-08-21 14:38:46 +08:00