Commit Graph

1473 Commits

Author SHA1 Message Date
Marvin Zhang
73fd3fd3d7 Merge pull request #538 from crawlab-team/release
Release
2020-02-10 19:33:41 +08:00
Marvin Zhang
79e9222e15 Merge pull request #537 from crawlab-team/develop
Develop
2020-02-10 19:32:37 +08:00
marvzhang
5b0e69e172 updated demo docker-compose.yml 2020-02-10 19:30:50 +08:00
Marvin Zhang
a0d5c8bc86 Merge pull request #536 from crawlab-team/develop
Develop
2020-02-10 19:29:32 +08:00
marvzhang
c3b1c8040a updated install-nodejs.sh 2020-02-10 19:28:47 +08:00
Marvin Zhang
78b1bf6fe3 Merge pull request #535 from crawlab-team/develop
updated install-nodejs.sh
2020-02-10 17:50:12 +08:00
marvzhang
8df923fd3c updated install-nodejs.sh 2020-02-10 17:45:47 +08:00
Marvin Zhang
05a4eb15b4 Merge pull request #534 from crawlab-team/develop
Develop
2020-02-10 17:42:49 +08:00
marvzhang
3e2bdb59f4 updated install-nodejs.sh 2020-02-10 17:41:14 +08:00
marvzhang
47a494a012 updated etl 2020-02-10 17:11:10 +08:00
Marvin Zhang
034ba9eef9 Merge pull request #533 from crawlab-team/develop
updated install-nodejs.sh
2020-02-10 17:05:43 +08:00
marvzhang
c50a9bb63e updated install-nodejs.sh 2020-02-10 17:04:53 +08:00
Marvin Zhang
48dd36fd80 Merge pull request #532 from crawlab-team/develop
updated install-nodejs.sh
2020-02-10 14:26:45 +08:00
marvzhang
70e911ade6 updated install-nodejs.sh 2020-02-10 14:26:14 +08:00
Marvin Zhang
8b097bb56c Merge pull request #531 from crawlab-team/develop
兼容Node.js爬虫
2020-02-10 13:24:56 +08:00
marvzhang
6b32709a39 兼容Node.js爬虫 2020-02-10 13:23:34 +08:00
Marvin Zhang
8496e2c4be Merge pull request #530 from crawlab-team/develop
added jd_mask_spider
2020-02-10 11:17:02 +08:00
marvzhang
143550f3c6 added jd_mask_spider 2020-02-10 11:15:37 +08:00
Marvin Zhang
d4bd2d0474 Merge pull request #529 from crawlab-team/develop
added node.js dependencies
2020-02-10 10:49:42 +08:00
Marvin Zhang
e4c989487d Merge pull request #528 from crawlab-team/develop
added node.js dependencies
2020-02-10 10:48:22 +08:00
marvzhang
9c2bdb077d added node.js dependencies 2020-02-10 10:45:29 +08:00
Marvin Zhang
80251029bf Merge pull request #526 from crawlab-team/release
Release
2020-02-09 09:03:25 +08:00
Marvin Zhang
649b0dee55 Merge pull request #525 from crawlab-team/develop
Develop
2020-02-09 09:03:06 +08:00
marvzhang
12b03cba8a fixed https://github.com/crawlab-team/crawlab/issues/524 2020-02-09 09:02:13 +08:00
marvzhang
4a62542eb1 fixed sinastock_spider issue 2020-02-08 09:51:11 +08:00
marvzhang
22b44d74fd 开启教程 2020-02-08 09:46:30 +08:00
Marvin Zhang
b35a252ede Merge pull request #523 from crawlab-team/release
Release
2020-02-08 09:43:12 +08:00
Marvin Zhang
f97a39cd80 Merge pull request #522 from crawlab-team/develop
修复教程
2020-02-08 09:42:42 +08:00
marvzhang
78f0f15167 修复教程 2020-02-08 09:39:45 +08:00
Marvin Zhang
6cc23a7bfe Merge pull request #521 from crawlab-team/release
Release
2020-02-08 09:34:51 +08:00
Marvin Zhang
989a3952fc Merge pull request #520 from crawlab-team/develop
Develop
2020-02-08 09:34:32 +08:00
marvzhang
a24058013d 默认允许发送统计信息 2020-02-08 09:32:42 +08:00
marvzhang
1144186816 优化免责声明 2020-02-07 16:25:17 +08:00
marvzhang
c5a0a135d2 fixed translation issue 2020-02-07 11:34:17 +08:00
marvzhang
71eb461875 fixed https://github.com/crawlab-team/crawlab/issues/295 2020-02-07 11:22:42 +08:00
marvzhang
3844a1676e fixed https://github.com/crawlab-team/crawlab/issues/519 2020-02-07 11:18:37 +08:00
Marvin Zhang
fd27ba1055 Merge pull request #518 from crawlab-team/release
Release
2020-02-07 10:13:53 +08:00
Marvin Zhang
809d04c871 Merge pull request #517 from crawlab-team/develop
Develop
2020-02-07 10:12:25 +08:00
marvzhang
cd0f1bdf1b Merge remote-tracking branch 'origin/develop' into develop 2020-02-07 10:10:54 +08:00
marvzhang
2f67aa5486 加入登录界面移动端提醒 2020-02-07 10:10:35 +08:00
Marvin Zhang
7f8f1b0140 Merge pull request #516 from 0xflotus/patch-1
fixed small errors
2020-02-06 09:19:53 +08:00
0xflotus
92297e226e fixed small errors 2020-02-05 21:03:05 +01:00
Marvin Zhang
d6799b1655 Merge pull request #513 from crawlab-team/master
Master
2020-02-04 09:40:23 +08:00
Marvin Zhang
99186b1b22 Merge pull request #512 from crawlab-team/develop
Develop
2020-02-04 09:37:00 +08:00
Jeremy
e05701818d Merge pull request #511 from hantmac/master
fix language show as go
2020-02-03 20:03:32 +08:00
hantmac
08fd04e72b Merge remote-tracking branch 'crawlab-team/master' 2020-02-03 20:00:06 +08:00
hantmac
ef926e2dbc Merge branch 'develop' 2020-02-03 19:59:05 +08:00
Marvin Zhang
83af06eb97 Merge pull request #510 from hantmac/develop
fix language show
2020-02-03 19:51:06 +08:00
hantmac
ca46f821d9 fix language show 2020-02-03 19:48:14 +08:00
Marvin Zhang
adaf464fb8 Update CHANGELOG-zh.md 2020-02-03 17:12:43 +08:00