git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-22 17:31:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,148 Commits 6 Branches 35 Tags
a216b3ceb5c5405f85d8d72cd1f7bba0fef9c751
Commit Graph

1148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
陈景阳
a216b3ceb5 fix 冲突 2020-01-07 00:36:56 +08:00
陈景阳
06f913f265 fix 冲突 2020-01-07 00:35:56 +08:00
陈景阳
4e66f6f3d2 优化UI界面 2020-01-02 10:07:21 +08:00
陈景阳
c028fa527f Merge branch 'upstream-master' into upstream-develop 2020-01-01 15:21:17 +08:00
暗音
aab8980772 Merge pull request #17 from crawlab-team/develop 
Develop
 2020-01-01 14:56:42 +08:00
marvzhang
6bf6212a22 加入依赖安装前端 2019-12-31 17:05:15 +08:00
marvzhang
c3d242a9bc updated vendor 2019-12-31 12:04:51 +08:00
marvzhang
8425ff26e8 更新依赖安装逻辑 2019-12-31 12:02:47 +08:00
marvzhang
3a1b945d09 fixed https://github.com/crawlab-team/crawlab/issues/407 2019-12-30 13:39:36 +08:00
marvzhang
a71a992805 updated Dockerfile.local 2019-12-30 12:22:36 +08:00
marvzhang
9ea3ece851 updated Dockerfile.local 2019-12-30 12:18:01 +08:00
marvzhang
8254faed2e updated Dockerfile 2019-12-29 12:12:44 +08:00
marvzhang
c327ad6521 updated Dockerfile 2019-12-29 12:04:52 +08:00
marvzhang
9073db32d0 Merge branch 'develop' of https://github.com/crawlab-team/crawlab into develop 2019-12-29 11:56:28 +08:00
marvzhang
0bc4a9c518 updated README.md 2019-12-29 11:56:18 +08:00
Marvin Zhang
4d610c3343 Merge pull request #405 from CSeanXu/bugfix/logview-scrolling 
bugfix: LogView Scrolling Fix
 2019-12-28 11:20:30 +08:00
Marvin Zhang
da1994ac0c Merge pull request #409 from crawlab-team/dependabot/npm_and_yarn/frontend/handlebars-4.5.3 
Bump handlebars from 4.1.0 to 4.5.3 in /frontend
 2019-12-28 11:20:01 +08:00
dependabot[bot]
edcb3c6003 Bump handlebars from 4.1.0 to 4.5.3 in /frontend 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.0 to 4.5.3.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.0...v4.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-28 00:50:11 +00:00
marvzhang
2f47a929d0 解决上传爬虫报错问题 2019-12-27 17:24:23 +08:00
marvzhang
e432f60ec2 added message 2019-12-27 16:39:05 +08:00
marvzhang
abd2042298 added message 2019-12-27 16:38:06 +08:00
Xu Qingjian
20f04d0eef bugfix: LogView Scrolling Fix 2019-12-27 16:11:30 +08:00
marvzhang
17634627f0 updated README.md 2019-12-27 16:07:39 +08:00
marvzhang
81ff9f0f82 fixed https://github.com/crawlab-team/crawlab/issues/403 2019-12-27 16:06:34 +08:00
marvzhang
8e0c76ca32 fixed https://github.com/crawlab-team/crawlab/issues/403 2019-12-27 16:06:19 +08:00
marvzhang
4f870a432b 添加百度统计事件 2019-12-26 13:08:32 +08:00
marvzhang
e283658b7d 添加百度统计事件 2019-12-26 13:07:28 +08:00
marvzhang
e08aa4c1f0 updated CHANGELOG.md 2019-12-26 13:06:21 +08:00
marvzhang
b3537eea6d fixed https://github.com/crawlab-team/crawlab/issues/341 2019-12-26 13:04:49 +08:00
marvzhang
85929d3c05 Merge remote-tracking branch 'origin/develop' into develop 2019-12-26 12:48:33 +08:00
marvzhang
59d2d41fe7 修复添加爬虫后直接运行错误 2019-12-26 12:47:56 +08:00
Marvin Zhang
7324bb52c2 Merge pull request #400 from yaziming/forked_develop2 
fix(backend):
 2019-12-26 11:29:13 +08:00
yaziming
6dced83896 fix(backend): 
临时解决修复偶发mongo多节点信息的问题，后续需重构
 2019-12-26 11:26:41 +08:00
marvzhang
a50141c9a8 updated version 2019-12-26 11:08:55 +08:00
marvzhang
e41bdc0b74 updated CHANGELOG.md 2019-12-26 10:59:47 +08:00
marvzhang
840d1633f8 updated CHANGELOG.md 2019-12-26 09:48:17 +08:00
marvzhang
c6e57fb74a 修复文档链接错误 2019-12-26 09:35:57 +08:00
marvzhang
3844cb8ca4 加入百度统计代码 2019-12-26 09:29:40 +08:00
marvzhang
fd1246f9d2 加入重命名 2019-12-25 21:10:39 +08:00
marvzhang
fca2302308 尝试加入重命名 2019-12-25 21:07:56 +08:00
marvzhang
6e0718e646 添加文件管理功能（后端） 2019-12-25 20:49:43 +08:00
marvzhang
25a75325c5 添加文件管理功能 2019-12-25 20:49:27 +08:00
marvzhang
dff0f6fbc4 Merge remote-tracking branch 'origin/develop' into develop 2019-12-25 19:47:02 +08:00
marvzhang
78b3bd5f9d 优化爬虫添加逻辑 2019-12-25 19:46:35 +08:00
marvzhang
8910a74b5d 优化添加爬虫逻辑 2019-12-25 19:46:09 +08:00
Marvin Zhang
175d43d422 Merge pull request #397 from yaziming/forked_develop2 
fix(backend): redis sub error
 2019-12-25 15:48:11 +08:00
yaziming
5fc2370f24 fix(backend): 
修复redis连接池订阅消息失败时，因为ping操作优先获取到错误造成chain提前关闭引发panic的问题
 2019-12-25 14:02:45 +08:00
暗音
b337dacdd8 Merge pull request #16 from crawlab-team/develop 
Develop
 2019-12-25 09:04:39 +08:00
Marvin Zhang
f96f623fc1 Merge pull request #395 from hantmac/develop 
fix
 2019-12-24 16:47:15 +08:00
hantmac
8888e71d1b fix 2019-12-24 16:44:54 +08:00