Commit Graph

6125 Commits

Author SHA1 Message Date
Marvin Zhang
e05f2c7c91 Merge pull request #169 from crawlab-team/develop
Develop
2019-08-25 10:29:53 +08:00
Marvin Zhang
28607a0890 updated CHANGELOG.md 2019-08-25 10:29:25 +08:00
Marvin Zhang
ec43057095 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
Marvin Zhang
0745cc30e6 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
陈景阳
efedf587a4 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
6b50a38f7c 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
e7a14ec300 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
c52393d56c 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
e2db0aa6a1 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
Marvin Zhang
8a82699f06 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
hantmac
366836d0aa 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
陈景阳
527f33abb4 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
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
3f249c8c61 bug fix:fix redis connection dead cycle 2019-08-24 15:16:27 +08:00
hantmac
f789352ad3 bug fix:fix redis connection dead cycle 2019-08-24 15:16:27 +08:00
陈景阳
ce8fb86700 添加注释 2019-08-24 15:11:52 +08:00
陈景阳
0ad2a06d36 添加注释 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
Marvin Zhang
a5b1d15cc0 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
陈景阳
3bc3eab776 前端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
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
2c0ac66cb1 Add unit test for task.go 2019-08-24 13:39:06 +08:00
hantmac
ec060a4dc1 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
068d3ed34b 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
618c4dabe5 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
c86c0bf0bb 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
96facb8d6f 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
5d2084fb18 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
Marvin Zhang
165a1f5d59 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
陈景阳
05dbbc535e 优化一点前端的UI 2019-08-23 20:39:14 +08:00
hantmac
44e98a56a3 unit test for stats.go 2019-08-23 20:28:11 +08:00