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
693 Commits 6 Branches 35 Tags
2bcd147a60f55501c2bbda53f490d081bc29e519
Commit Graph

693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marvin Zhang
2bcd147a60 Merge pull request #176 from yaziming/forked/develop 
JSON -> AbortWithStatusJSON
 2019-08-27 08:45:49 +08:00
yaziming
b11f31ec18 JSON -> AbortWithStatusJSON 2019-08-26 23:13:26 +08:00
Marvin Zhang
83a0e59e5a Merge pull request #175 from hantmac/master 
add unit test for routes/spider.go
 2019-08-26 22:16:06 +08:00
hantmac
9530a3d9b0 add unit test for routes/spider.go 2019-08-26 21:10:55 +08:00
Marvin Zhang
50e2e8472a 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
f7c0e8310a bug fix:fix permission bug when create spiders dir caused by umask 2019-08-26 17:44:01 +08:00
Marvin Zhang
787d87c35c Merge pull request #170 from hantmac/master 
hot fix:fix redis lose connection problem
 2019-08-26 10:44:57 +08:00
hantmac
9855d9ef6a hot fix:fix redis lose connection problem 2019-08-26 10:38:40 +08:00
Marvin Zhang
e05f2c7c91 Merge pull request #169 from crawlab-team/develop 
Develop
 2019-08-25 10:29:53 +08:00
Marvin Zhang
ec43057095 updated CHANGELOG.md 2019-08-25 10:29:25 +08:00
Marvin Zhang
0745cc30e6 updated Dockerfile.frontend.alpine 2019-08-24 22:01:23 +08:00
Marvin Zhang
6b50a38f7c Merge pull request #168 from crawlab-team/develop 
Develop
 2019-08-24 17:30:14 +08:00
Marvin Zhang
e7a14ec300 updated Jenkinsfile 2019-08-24 17:28:23 +08:00
Marvin Zhang
c52393d56c Merge remote-tracking branch 'origin/develop' into develop 2019-08-24 17:15:00 +08:00
Marvin Zhang
e2db0aa6a1 added language switch on login page 2019-08-24 16:56:08 +08:00
Marvin Zhang
8a82699f06 Merge pull request #167 from hantmac/develop 
remove redundant code
 2019-08-24 16:23:28 +08:00
hantmac
366836d0aa remove redundant code 2019-08-24 15:50:53 +08:00
Marvin Zhang
2981fec602 Merge pull request #166 from hantmac/develop 
bug fix: fix redis connection dead cycle
 2019-08-24 15:21:59 +08:00
hantmac
f789352ad3 bug fix:fix redis connection dead cycle 2019-08-24 15:16:27 +08:00
Marvin Zhang
a5b1d15cc0 Merge pull request #165 from wo10378931/master 
优化前端UI
 2019-08-24 14:59:30 +08:00
陈景阳
3bc3eab776 前端UI优化 2019-08-24 14:14:08 +08:00
Marvin Zhang
12016de0f5 Merge pull request #164 from hantmac/develop 
Add unit test for task.go
 2019-08-24 13:41:04 +08:00
hantmac
ec060a4dc1 Add unit test for task.go 2019-08-24 13:39:06 +08:00
Marvin Zhang
068d3ed34b Merge pull request #163 from crawlab-team/develop 
Develop
 2019-08-24 13:14:45 +08:00
Marvin Zhang
618c4dabe5 updated README 2019-08-24 13:12:15 +08:00
Marvin Zhang
c86c0bf0bb updated README 2019-08-24 13:09:20 +08:00
Marvin Zhang
96facb8d6f Merge branch 'develop' of github.com:tikazyq/crawlab into develop 2019-08-24 12:53:13 +08:00
Marvin Zhang
5d2084fb18 updated Jenkinsfile 2019-08-24 12:53:00 +08:00
Marvin Zhang
165a1f5d59 Merge pull request #162 from hantmac/develop 
unit test for stats.go
 2019-08-23 20:52:24 +08:00
陈景阳
05dbbc535e 优化一点前端的UI 2019-08-23 20:39:14 +08:00
hantmac
2a886956da unit test for stats.go 2019-08-23 20:28:11 +08:00
Marvin Zhang
9904b1da47 Merge pull request #160 from tikazyq/develop 
Develop
 2019-08-22 19:29:52 +08:00
Marvin Zhang
c3d710bb16 updated Jenkinsfile 2019-08-22 19:29:17 +08:00
Marvin Zhang
145b3b4d68 Merge branch 'develop' of github.com:tikazyq/crawlab into develop 2019-08-22 19:28:26 +08:00
Marvin Zhang
6fcc23fa6b updated README 2019-08-22 19:26:57 +08:00
Marvin Zhang
aebd5cf522 Merge pull request #158 from hantmac/develop 
modify unit test to use mock
 2019-08-22 17:39:19 +08:00
hantmac
03fc2a8e54 modify unit test to use mock 2019-08-22 16:20:30 +08:00
Marvin Zhang
559d317ec5 Merge pull request #154 from wo10378931/master 
update 节点注册使用独立的key字段，而不是使用mac字段
 2019-08-21 15:09:29 +08:00
陈景阳
221aa33a79 Merge branch 'master' of https://github.com/tikazyq/crawlab 2019-08-21 14:38:46 +08:00
陈景阳
d913d7c40f fix TagsView.vue 导致前端报错的问题 
update 节点注册使用独立的key字段，而不是使用mac字段
 2019-08-21 14:37:55 +08:00
Marvin Zhang
3b5db8ffa0 Merge pull request #151 from hantmac/develop 
Code optimization:change the crawler zip file to slice read
 2019-08-20 17:22:32 +08:00
hantmac
21a68693c3 Code optimization:change the crawler zip file to slice read 2019-08-20 17:09:43 +08:00
hantmac
005abc68c8 Code optimization:change the crawler zip file to slice read 2019-08-20 16:59:53 +08:00
Marvin Zhang
b286ec5193 Merge pull request #149 from hantmac/develop 
Add unit test for routes/node
 2019-08-19 19:06:35 +08:00
hantmac
dcd33910cc Complete unite test for backend/database/mongo.go 2019-08-19 18:48:25 +08:00
hantmac
6ad6a938fa Add unit test for routes/node 2019-08-19 18:06:49 +08:00
Marvin Zhang
8f2d711810 Merge pull request #148 from hantmac/develop 
bug fix: fixed mongo.go unit test
 2019-08-19 10:15:50 +08:00
hantmac
51707e8f2a bug fix: fixed mongo.go unit test 2019-08-19 09:56:16 +08:00
Marvin Zhang
0e149f429d Merge pull request #147 from tikazyq/develop 
Develop
 2019-08-18 22:24:04 +08:00
Marvin Zhang
5fa819a4ee Merge pull request #146 from hantmac/develop 
Develop-Complete Unit Test for package utils
 2019-08-18 19:46:34 +08:00