Commit Graph

1482 Commits

Author SHA1 Message Date
Marvin Zhang
6dbd0df9f6 Merge pull request #547 from crawlab-team/develop
fixed https://github.com/crawlab-team/crawlab/issues/546
2020-02-12 11:50:48 +08:00
marvzhang
469ce98411 fixed https://github.com/crawlab-team/crawlab/issues/546 2020-02-12 11:49:37 +08:00
Marvin Zhang
c7b7fea816 Merge pull request #545 from crawlab-team/develop
Develop
2020-02-11 18:26:15 +08:00
marvzhang
93891bb9ad 优化UI 2020-02-11 18:24:49 +08:00
marvzhang
7da9c38e23 优化结果显示 2020-02-11 18:23:49 +08:00
Marvin Zhang
551d6b5f63 Merge pull request #544 from crawlab-team/develop
Develop
2020-02-11 18:04:47 +08:00
marvzhang
f3b8bcc510 添加日志搜索功能 2020-02-11 17:47:01 +08:00
marvzhang
93e6e5c8a8 优化UI 2020-02-11 15:51:02 +08:00
Marvin Zhang
1adb912ad7 Merge pull request #543 from crawlab-team/develop
Develop
2020-02-11 15:46:33 +08:00
marvzhang
7dc7a395ef 优化节点详情UI 2020-02-11 15:44:46 +08:00
marvzhang
fd62adc8ba 优化爬虫执行逻辑 2020-02-11 15:37:06 +08:00
Marvin Zhang
0d335e6420 Merge pull request #541 from crawlab-team/develop
Develop
2020-02-11 10:08:01 +08:00
marvzhang
a0c47e54e8 updated spiders 2020-02-11 10:06:03 +08:00
marvzhang
99aecf8938 added dumb-init in Dockerfile 2020-02-11 10:04:41 +08:00
Marvin Zhang
3ddd56b44f Merge pull request #539 from crawlab-team/develop
updated install-nodejs.sh
2020-02-11 09:37:31 +08:00
marvzhang
a62fec9c01 updated install-nodejs.sh 2020-02-11 09:36:34 +08:00
Marvin Zhang
4685b7772f Merge pull request #537 from crawlab-team/develop
Develop
2020-02-10 19:32:37 +08:00
marvzhang
56f1be60dc updated demo docker-compose.yml 2020-02-10 19:30:50 +08:00
marvzhang
7e85f561bf updated install-nodejs.sh 2020-02-10 19:28:47 +08:00
Marvin Zhang
4ce61d1b26 Merge pull request #535 from crawlab-team/develop
updated install-nodejs.sh
2020-02-10 17:50:12 +08:00
marvzhang
e1e363eb40 updated install-nodejs.sh 2020-02-10 17:45:47 +08:00
Marvin Zhang
a7b9c0445e Merge pull request #534 from crawlab-team/develop
Develop
2020-02-10 17:42:49 +08:00
marvzhang
3363d08797 updated install-nodejs.sh 2020-02-10 17:41:14 +08:00
marvzhang
6f5e99c1ae updated etl 2020-02-10 17:11:10 +08:00
Marvin Zhang
b56d14bbdf Merge pull request #533 from crawlab-team/develop
updated install-nodejs.sh
2020-02-10 17:05:43 +08:00
marvzhang
6002c94dce updated install-nodejs.sh 2020-02-10 17:04:53 +08:00
Marvin Zhang
b1ec70c4d8 Merge pull request #532 from crawlab-team/develop
updated install-nodejs.sh
2020-02-10 14:26:45 +08:00
marvzhang
2403c69329 updated install-nodejs.sh 2020-02-10 14:26:14 +08:00
Marvin Zhang
7c30bcf3fd Merge pull request #531 from crawlab-team/develop
兼容Node.js爬虫
2020-02-10 13:24:56 +08:00
marvzhang
8d1d7c9b1d 兼容Node.js爬虫 2020-02-10 13:23:34 +08:00
Marvin Zhang
60170f755a Merge pull request #530 from crawlab-team/develop
added jd_mask_spider
2020-02-10 11:17:02 +08:00
marvzhang
ef991e1056 added jd_mask_spider 2020-02-10 11:15:37 +08:00
Marvin Zhang
bbc754c23f Merge pull request #529 from crawlab-team/develop
added node.js dependencies
2020-02-10 10:49:42 +08:00
marvzhang
5590b9d97c added node.js dependencies 2020-02-10 10:45:29 +08:00
Marvin Zhang
ce906a84d1 Merge pull request #525 from crawlab-team/develop
Develop
2020-02-09 09:03:06 +08:00
marvzhang
8aed6c1de7 fixed https://github.com/crawlab-team/crawlab/issues/524 2020-02-09 09:02:13 +08:00
marvzhang
d4cdfda5ff fixed sinastock_spider issue 2020-02-08 09:51:11 +08:00
marvzhang
fb91f5f09d 开启教程 2020-02-08 09:46:30 +08:00
Marvin Zhang
daa9d4d3e9 Merge pull request #522 from crawlab-team/develop
修复教程
2020-02-08 09:42:42 +08:00
marvzhang
033a4a26f0 修复教程 2020-02-08 09:39:45 +08:00
Marvin Zhang
56af98f647 Merge pull request #520 from crawlab-team/develop
Develop
2020-02-08 09:34:32 +08:00
marvzhang
0b4b118c24 默认允许发送统计信息 2020-02-08 09:32:42 +08:00
marvzhang
78743c672b 优化免责声明 2020-02-07 16:25:17 +08:00
marvzhang
854b1b9e18 fixed translation issue 2020-02-07 11:34:17 +08:00
marvzhang
1f09857a93 fixed https://github.com/crawlab-team/crawlab/issues/295 2020-02-07 11:22:42 +08:00
marvzhang
59c47358e3 fixed https://github.com/crawlab-team/crawlab/issues/519 2020-02-07 11:18:37 +08:00
Marvin Zhang
1d87017b06 Merge pull request #517 from crawlab-team/develop
Develop
2020-02-07 10:12:25 +08:00
marvzhang
fbd2134114 Merge remote-tracking branch 'origin/develop' into develop 2020-02-07 10:10:54 +08:00
marvzhang
770513b05c 加入登录界面移动端提醒 2020-02-07 10:10:35 +08:00
Marvin Zhang
1d4eeb0f65 Merge pull request #516 from 0xflotus/patch-1
fixed small errors
2020-02-06 09:19:53 +08:00