Commit Graph

1335 Commits

Author SHA1 Message Date
陈景阳
8f54633eff 还原代码 2020-02-01 13:08:49 +08:00
陈景阳
dfcc32a0fd 还原代码 2020-02-01 13:08:15 +08:00
陈景阳
07edf8b2e8 fix 启动报错的问题 2020-02-01 12:53:44 +08:00
陈景阳
7d8cca3d28 Merge remote-tracking branch 'upstream/develop' into upstream-develop
# Conflicts:
#	backend/main.go
#	frontend/.env.development
2020-01-28 15:51:09 +08:00
暗音
0e24f75ec2 Merge pull request #22 from crawlab-team/master
同步源码
2020-01-28 15:47:31 +08:00
陈景阳
0b6524177c fix 回退配置文件信息 2020-01-28 15:46:15 +08:00
陈景阳
4825653ae0 fix 无法及时同步爬虫的问题 2020-01-28 15:43:57 +08:00
陈景阳
3e792a24d2 feature 新增全局环境变量 2020-01-28 15:12:33 +08:00
陈景阳
b139c7fe6c feature 新增全局环境变量 2020-01-28 15:12:12 +08:00
Marvin Zhang
e37153ddf2 Merge pull request #487 from crawlab-team/release
Release
2020-01-28 11:08:56 +08:00
Marvin Zhang
5cfd52e462 Merge pull request #486 from crawlab-team/develop
Develop
2020-01-28 11:08:38 +08:00
marvzhang
6849d677ad added adding node instruction 2020-01-28 11:05:23 +08:00
marvzhang
e9ef0e69be added adding node instruction 2020-01-28 11:03:21 +08:00
marvzhang
5d2e7a14e5 re-order file create items 2020-01-28 10:31:19 +08:00
marvzhang
89991593ee fixed https://github.com/crawlab-team/crawlab/issues/480 2020-01-28 10:01:02 +08:00
marvzhang
bcae02efbe code cleanup 2020-01-28 09:55:53 +08:00
marvzhang
b008b95172 fixed 版本无法显示问题 2020-01-28 09:52:57 +08:00
marvzhang
03d5e19140 fixed https://github.com/crawlab-team/crawlab/issues/479 2020-01-28 09:52:37 +08:00
Marvin Zhang
6a7af3b601 Merge pull request #484 from crawlab-team/release
Release
2020-01-27 09:50:42 +08:00
Marvin Zhang
d79a12835e Merge pull request #483 from crawlab-team/develop
Develop
2020-01-27 09:50:04 +08:00
marvzhang
2c9258f165 updated issue templates 2020-01-27 09:49:32 +08:00
marvzhang
fcebbd9a77 updated env to adapt api.crawlab.cn 2020-01-27 09:29:41 +08:00
marvzhang
7026bfb272 updated demo 2020-01-27 09:07:43 +08:00
Marvin Zhang
3b79e718f6 Update docker-compose.yml 2020-01-24 12:02:02 +08:00
陈景阳
d2dd6fb117 解决冲突 2020-01-23 11:09:35 +08:00
暗音
ad0df03cc0 Merge pull request #21 from crawlab-team/develop
Develop
2020-01-23 11:05:20 +08:00
Marvin Zhang
296c39bd47 Merge pull request #478 from crawlab-team/release
Release
2020-01-22 12:20:19 +08:00
Marvin Zhang
8cdf3d5e5d Merge pull request #477 from crawlab-team/develop
更新不显示version问题
2020-01-22 12:20:04 +08:00
marvzhang
e659d60c0e 更新不显示version问题 2020-01-22 12:17:59 +08:00
Marvin Zhang
a5a069689d Merge pull request #476 from crawlab-team/release
Release
2020-01-22 11:10:34 +08:00
Marvin Zhang
ccfbd47b8a Merge pull request #475 from crawlab-team/develop
updated stats
2020-01-22 11:10:06 +08:00
marvzhang
ec76d07b1a updated stats 2020-01-22 11:07:38 +08:00
Marvin Zhang
ec17f93e70 Merge pull request #473 from crawlab-team/release
Release
2020-01-21 15:43:05 +08:00
Marvin Zhang
a3035f35a6 Merge pull request #472 from crawlab-team/develop
Develop
2020-01-21 15:42:09 +08:00
marvzhang
0ccac805d7 updated stats 2020-01-21 15:40:17 +08:00
marvzhang
47c224ecf4 updated stats 2020-01-21 15:40:03 +08:00
Marvin Zhang
2cc7d2b2e7 Merge pull request #469 from crawlab-team/release
Release
2020-01-21 11:36:00 +08:00
Marvin Zhang
bfb9039911 Merge pull request #468 from crawlab-team/develop
调整统计逻辑
2020-01-21 11:35:15 +08:00
marvzhang
e528485617 调整统计逻辑 2020-01-21 11:34:09 +08:00
暗音
d7183ad664 Merge pull request #20 from crawlab-team/master
同步源仓库
2020-01-20 12:00:55 +08:00
Marvin Zhang
55a35540e1 Merge pull request #464 from crawlab-team/release
Release
2020-01-19 12:32:10 +08:00
Marvin Zhang
2976e3ae9f Merge pull request #463 from crawlab-team/develop
Develop
2020-01-19 12:31:46 +08:00
marvzhang
a537db79b1 remove verbose 2020-01-19 12:31:21 +08:00
marvzhang
074bddfbb7 修复定时任务问题 2020-01-19 12:30:57 +08:00
Marvin Zhang
2269c0ab3c Merge pull request #460 from crawlab-team/release
Release
2020-01-17 14:28:50 +08:00
Marvin Zhang
fd5b2732ac Merge pull request #459 from crawlab-team/develop
Develop
2020-01-17 14:16:55 +08:00
marvzhang
2698e44654 updated CHANGELOG 2020-01-17 14:14:30 +08:00
marvzhang
239b165122 fixed missing form validation before uploading spider file error 2020-01-17 14:12:53 +08:00
marvzhang
da69a10acf fixed unable to click crawl button on spider page for configurable spiders 2020-01-17 13:52:52 +08:00
marvzhang
09885c4d45 Merge branch 'develop' of https://github.com/crawlab-team/crawlab into develop 2020-01-17 13:43:44 +08:00