Commit Graph

5948 Commits

Author SHA1 Message Date
Marvin Zhang
9c1d99a893 Merge pull request #444 from crawlab-team/develop
fixed "nil returned" error
2020-01-10 18:44:43 +08:00
Marvin Zhang
5e08eb0eab Merge pull request #444 from crawlab-team/develop
fixed "nil returned" error
2020-01-10 18:44:43 +08:00
marvzhang
09cef0a10a fixed "nil returned" error 2020-01-10 18:42:37 +08:00
marvzhang
e5cd929a2a fixed "nil returned" error 2020-01-10 18:42:37 +08:00
Marvin Zhang
dbc566daa3 Merge pull request #443 from crawlab-team/develop
updated README
2020-01-10 18:41:38 +08:00
Marvin Zhang
11dc9afd75 Merge pull request #443 from crawlab-team/develop
updated README
2020-01-10 18:41:38 +08:00
marvzhang
95083bc47c updated README 2020-01-10 17:22:14 +08:00
marvzhang
a974d636c9 updated README 2020-01-10 17:22:14 +08:00
Marvin Zhang
96b925ce8e Merge pull request #442 from crawlab-team/develop
Develop
2020-01-10 15:17:03 +08:00
Marvin Zhang
8bbe16e2ed Merge pull request #442 from crawlab-team/develop
Develop
2020-01-10 15:17:03 +08:00
marvzhang
65261a5797 修复rpc timeout 报错问题 2020-01-10 15:16:34 +08:00
marvzhang
ff074d78f4 修复rpc timeout 报错问题 2020-01-10 15:16:34 +08:00
marvzhang
d124c6c96f 加入api.crawlab.cn数据追踪 2020-01-10 14:37:50 +08:00
marvzhang
65c25fd1ce 加入api.crawlab.cn数据追踪 2020-01-10 14:37:50 +08:00
Marvin Zhang
85b94f1ef4 Merge pull request #440 from crawlab-team/develop
更新百度统计
2020-01-08 20:11:47 +08:00
Marvin Zhang
61cad1e839 Merge pull request #440 from crawlab-team/develop
更新百度统计
2020-01-08 20:11:47 +08:00
marvzhang
aa5ae87eeb 更新百度统计 2020-01-08 20:11:05 +08:00
marvzhang
1824ad61c8 更新百度统计 2020-01-08 20:11:05 +08:00
Marvin Zhang
21c2ccd483 Merge pull request #438 from crawlab-team/develop
fixed baidu tongji issue
2020-01-08 10:14:41 +08:00
Marvin Zhang
f2eb532349 Merge pull request #438 from crawlab-team/develop
fixed baidu tongji issue
2020-01-08 10:14:41 +08:00
marvzhang
7d189e9567 fixed baidu tongji issue 2020-01-08 10:14:12 +08:00
marvzhang
e441a4d984 fixed baidu tongji issue 2020-01-08 10:14:12 +08:00
暗音
adf351ae32 Merge pull request #19 from crawlab-team/master
合并源码
2020-01-08 09:38:08 +08:00
暗音
35a2a95eaf Merge pull request #19 from crawlab-team/master
合并源码
2020-01-08 09:38:08 +08:00
Marvin Zhang
93113fa971 Merge pull request #437 from crawlab-team/develop
fixed docker build error
v0.4.3
2020-01-07 15:31:28 +08:00
Marvin Zhang
05d8cb656a Merge pull request #437 from crawlab-team/develop
fixed docker build error
2020-01-07 15:31:28 +08:00
marvzhang
82199129a1 fixed docker build error 2020-01-07 15:30:20 +08:00
marvzhang
401f8d6659 fixed docker build error 2020-01-07 15:30:20 +08:00
Marvin Zhang
83773ebceb Merge pull request #434 from crawlab-team/develop
fixed docker build error issue
2020-01-07 14:57:55 +08:00
Marvin Zhang
60c92d8489 Merge pull request #434 from crawlab-team/develop
fixed docker build error issue
2020-01-07 14:57:55 +08:00
marvzhang
816f70b8fa fixed docker build error issue 2020-01-07 14:51:09 +08:00
marvzhang
0c856681ad fixed docker build error issue 2020-01-07 14:51:09 +08:00
Marvin Zhang
3e157f6713 Merge pull request #433 from crawlab-team/develop
Develop
2020-01-07 13:55:29 +08:00
Marvin Zhang
a2b5149bb4 Merge pull request #433 from crawlab-team/develop
Develop
2020-01-07 13:55:29 +08:00
marvzhang
27156b4d40 updated CHANGELOG 2020-01-07 13:54:54 +08:00
marvzhang
26d541adde updated CHANGELOG 2020-01-07 13:54:54 +08:00
marvzhang
edece9a768 fixed duplicated AssignTask method 2020-01-07 13:54:24 +08:00
marvzhang
25fc1ca36a fixed duplicated AssignTask method 2020-01-07 13:54:24 +08:00
Marvin Zhang
0bc5e6f970 Merge pull request #432 from wo10378931/develop
Develop
2020-01-07 13:46:59 +08:00
Marvin Zhang
322be6843f Merge pull request #432 from wo10378931/develop
Develop
2020-01-07 13:46:59 +08:00
marvzhang
26e69cfabb fixed github star placeholder color 2020-01-07 13:39:53 +08:00
marvzhang
454420ce71 fixed github star placeholder color 2020-01-07 13:39:53 +08:00
Marvin Zhang
e211a1111b Merge pull request #431 from crawlab-team/develop
Develop
2020-01-07 13:35:43 +08:00
Marvin Zhang
cffd333e3f Merge pull request #431 from crawlab-team/develop
Develop
2020-01-07 13:35:43 +08:00
marvzhang
e0659809a2 updated docker-compose.yml 2020-01-07 13:34:57 +08:00
marvzhang
6e8314536d updated docker-compose.yml 2020-01-07 13:34:57 +08:00
marvzhang
1f63f6fb30 fixed api url issue 2020-01-07 12:42:01 +08:00
marvzhang
7ad434eadf fixed api url issue 2020-01-07 12:42:01 +08:00
Marvin Zhang
bb834d9e6c Merge pull request #430 from wo10378931/develop
Develop
2020-01-07 08:22:06 +08:00
Marvin Zhang
debb692d9f Merge pull request #430 from wo10378931/develop
Develop
2020-01-07 08:22:06 +08:00