Commit Graph

1722 Commits

Author SHA1 Message Date
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
Marvin Zhang
61bcffae3e Merge pull request #536 from crawlab-team/develop
Develop
2020-02-10 19:29:32 +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
Marvin Zhang
dd14edb784 Merge pull request #528 from crawlab-team/develop
added node.js dependencies
2020-02-10 10:48:22 +08:00
marvzhang
5590b9d97c added node.js dependencies 2020-02-10 10:45:29 +08:00
Marvin Zhang
75617590a2 Merge pull request #526 from crawlab-team/release
Release
2020-02-09 09:03:25 +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
fa4bf6eb5a Merge pull request #523 from crawlab-team/release
Release
2020-02-08 09:43:12 +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
80c3d09c79 Merge pull request #521 from crawlab-team/release
Release
2020-02-08 09:34:51 +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
731b205a29 Merge pull request #518 from crawlab-team/release
Release
2020-02-07 10:13:53 +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
0xflotus
f1ab63d9eb fixed small errors 2020-02-05 21:03:05 +01:00
Marvin Zhang
b8e4594829 Merge pull request #513 from crawlab-team/master
Master
2020-02-04 09:40:23 +08:00
Marvin Zhang
e336330243 Merge pull request #512 from crawlab-team/develop
Develop
2020-02-04 09:37:00 +08:00
Jeremy
283784a216 Merge pull request #511 from hantmac/master
fix language show as go
2020-02-03 20:03:32 +08:00
hantmac
ecc6ca594d Merge remote-tracking branch 'crawlab-team/master' 2020-02-03 20:00:06 +08:00
hantmac
f3a487dbfd Merge branch 'develop' 2020-02-03 19:59:05 +08:00
Marvin Zhang
d25dab9b25 Merge pull request #510 from hantmac/develop
fix language show
2020-02-03 19:51:06 +08:00
hantmac
2408c5423d fix language show 2020-02-03 19:48:14 +08:00
Marvin Zhang
ba3e3cdca4 Update CHANGELOG-zh.md 2020-02-03 17:12:43 +08:00
Marvin Zhang
90a724535a Merge pull request #509 from crawlab-team/release
Release
2020-02-03 17:11:06 +08:00