Commit Graph

1334 Commits

Author SHA1 Message Date
陈景阳
ec5afd7985 还原代码 2020-02-01 13:08:15 +08:00
陈景阳
100e7631fb fix 启动报错的问题 2020-02-01 12:53:44 +08:00
陈景阳
fcfaf8ba77 Merge remote-tracking branch 'upstream/develop' into upstream-develop
# Conflicts:
#	backend/main.go
#	frontend/.env.development
2020-01-28 15:51:09 +08:00
暗音
f077e5db60 Merge pull request #22 from crawlab-team/master
同步源码
2020-01-28 15:47:31 +08:00
陈景阳
af190f36cc fix 回退配置文件信息 2020-01-28 15:46:15 +08:00
陈景阳
81edf9ab72 fix 无法及时同步爬虫的问题 2020-01-28 15:43:57 +08:00
陈景阳
123e3835d2 feature 新增全局环境变量 2020-01-28 15:12:33 +08:00
陈景阳
092c1a2617 feature 新增全局环境变量 2020-01-28 15:12:12 +08:00
Marvin Zhang
9ff7931687 Merge pull request #487 from crawlab-team/release
Release
2020-01-28 11:08:56 +08:00
Marvin Zhang
a5a8bd4eca Merge pull request #486 from crawlab-team/develop
Develop
2020-01-28 11:08:38 +08:00
marvzhang
fd75cfb628 added adding node instruction 2020-01-28 11:05:23 +08:00
marvzhang
b31a505094 added adding node instruction 2020-01-28 11:03:21 +08:00
marvzhang
392c6cf7c0 re-order file create items 2020-01-28 10:31:19 +08:00
marvzhang
b737e9a69d fixed https://github.com/crawlab-team/crawlab/issues/480 2020-01-28 10:01:02 +08:00
marvzhang
67321fcf01 code cleanup 2020-01-28 09:55:53 +08:00
marvzhang
1317f8d618 fixed 版本无法显示问题 2020-01-28 09:52:57 +08:00
marvzhang
6d98e719f3 fixed https://github.com/crawlab-team/crawlab/issues/479 2020-01-28 09:52:37 +08:00
Marvin Zhang
42a33496dc Merge pull request #484 from crawlab-team/release
Release
2020-01-27 09:50:42 +08:00
Marvin Zhang
48aee0526e Merge pull request #483 from crawlab-team/develop
Develop
2020-01-27 09:50:04 +08:00
marvzhang
7ff42f46d1 updated issue templates 2020-01-27 09:49:32 +08:00
marvzhang
689ce564f3 updated env to adapt api.crawlab.cn 2020-01-27 09:29:41 +08:00
marvzhang
e3c8cff27c updated demo 2020-01-27 09:07:43 +08:00
Marvin Zhang
fe3666ed08 Update docker-compose.yml 2020-01-24 12:02:02 +08:00
陈景阳
9a748fc5cd 解决冲突 2020-01-23 11:09:35 +08:00
暗音
e2d95935f2 Merge pull request #21 from crawlab-team/develop
Develop
2020-01-23 11:05:20 +08:00
Marvin Zhang
228a3a5014 Merge pull request #478 from crawlab-team/release
Release
2020-01-22 12:20:19 +08:00
Marvin Zhang
48b189b629 Merge pull request #477 from crawlab-team/develop
更新不显示version问题
2020-01-22 12:20:04 +08:00
marvzhang
2a199677be 更新不显示version问题 2020-01-22 12:17:59 +08:00
Marvin Zhang
c3e7e79304 Merge pull request #476 from crawlab-team/release
Release
2020-01-22 11:10:34 +08:00
Marvin Zhang
0cdbff5c25 Merge pull request #475 from crawlab-team/develop
updated stats
2020-01-22 11:10:06 +08:00
marvzhang
e3f4bcd0ab updated stats 2020-01-22 11:07:38 +08:00
Marvin Zhang
e28c54e594 Merge pull request #473 from crawlab-team/release
Release
2020-01-21 15:43:05 +08:00
Marvin Zhang
60ee522eb3 Merge pull request #472 from crawlab-team/develop
Develop
2020-01-21 15:42:09 +08:00
marvzhang
f265ecafe8 updated stats 2020-01-21 15:40:17 +08:00
marvzhang
b101b8b8cd updated stats 2020-01-21 15:40:03 +08:00
Marvin Zhang
be4bd2f2d4 Merge pull request #469 from crawlab-team/release
Release
2020-01-21 11:36:00 +08:00
Marvin Zhang
ba338acba8 Merge pull request #468 from crawlab-team/develop
调整统计逻辑
2020-01-21 11:35:15 +08:00
marvzhang
18deb7de74 调整统计逻辑 2020-01-21 11:34:09 +08:00
暗音
efc935f65a Merge pull request #20 from crawlab-team/master
同步源仓库
2020-01-20 12:00:55 +08:00
Marvin Zhang
ce767fd3e9 Merge pull request #464 from crawlab-team/release
Release
2020-01-19 12:32:10 +08:00
Marvin Zhang
4658d86988 Merge pull request #463 from crawlab-team/develop
Develop
2020-01-19 12:31:46 +08:00
marvzhang
60c3c056d0 remove verbose 2020-01-19 12:31:21 +08:00
marvzhang
47a9db024a 修复定时任务问题 2020-01-19 12:30:57 +08:00
Marvin Zhang
8bf6d3fc9f Merge pull request #460 from crawlab-team/release
Release
v0.4.4
2020-01-17 14:28:50 +08:00
Marvin Zhang
ef95ae51df Merge pull request #459 from crawlab-team/develop
Develop
2020-01-17 14:16:55 +08:00
marvzhang
ca2e779708 updated CHANGELOG 2020-01-17 14:14:30 +08:00
marvzhang
4a3d48dde6 fixed missing form validation before uploading spider file error 2020-01-17 14:12:53 +08:00
marvzhang
128df1c4a2 fixed unable to click crawl button on spider page for configurable spiders 2020-01-17 13:52:52 +08:00
marvzhang
55a5ecd226 Merge branch 'develop' of https://github.com/crawlab-team/crawlab into develop 2020-01-17 13:43:44 +08:00
marvzhang
c17a05fe2f updated readme 2020-01-17 13:43:29 +08:00