Commit Graph

559 Commits

Author SHA1 Message Date
0xflotus
a9c51995fd Merge pull request #2 from 0xflotus/patch-1
fixed small errors
2019-08-02 09:51:33 +02:00
0xflotus
a8fd4afd58 fixed small errors 2019-08-02 09:51:21 +02:00
0xflotus
56c60b45e1 Merge pull request #1 from 0xflotus/patch-1
fixed code highlighting
2019-08-02 09:50:15 +02:00
0xflotus
c0f0af0505 fixed code highlighting 2019-08-02 09:49:59 +02:00
Marvin Zhang
500d2b09d6 Merge pull request #101 from tikazyq/develop
Develop
2019-08-01 14:38:54 +08:00
Marvin Zhang
345ae2da17 Update README.md 2019-08-01 14:36:29 +08:00
Marvin Zhang
fa26cb1f8f Update README-zh.md 2019-08-01 14:19:31 +08:00
Marvin Zhang
e0d44c9905 Merge pull request #100 from tikazyq/develop
Develop
2019-08-01 13:29:04 +08:00
Marvin Zhang
8dfabe5c00 updated Jenkinsfile 2019-08-01 13:18:10 +08:00
Marvin Zhang
24cbf54f57 updated Jenkinsfile 2019-08-01 13:00:54 +08:00
Marvin Zhang
e21c4631bf added documentation link 2019-08-01 12:43:50 +08:00
Marvin Zhang
430f74fb13 Merge pull request #98 from wo10378931/master
FIX 当爬虫为空的时候,导致前端列表报错
2019-08-01 11:39:24 +08:00
陈景阳
a09d2f8b50 FIX 当爬虫为空的时候,导致前端列表报错 2019-08-01 11:32:39 +08:00
Marvin Zhang
b5ffbf13f5 Merge pull request #97 from wo10378931/master
添加开发环境下worker节点的运行示例
2019-08-01 09:42:17 +08:00
陈景阳
5853af8b4c 添加开发环境下worker节点的运行实例 2019-08-01 09:22:23 +08:00
暗音
2947f0327b Merge pull request #2 from tikazyq/master
Update 源库
2019-08-01 08:58:31 +08:00
Marvin Zhang
6bccf4d612 updated jenkins/docker-compose.yml 2019-07-31 20:53:37 +08:00
Marvin Zhang
33483a4348 updated jenkins/docker-compose.yml 2019-07-31 20:45:53 +08:00
Marvin Zhang
db0ddbbe62 updated jenkins/docker-compose.yml 2019-07-31 20:34:36 +08:00
Marvin Zhang
6ee8d53d3c Merge pull request #96 from tikazyq/develop
Develop
2019-07-31 20:27:26 +08:00
Marvin Zhang
3136671144 updated README 2019-07-31 20:26:43 +08:00
Marvin Zhang
0c1250d6eb updated README 2019-07-31 20:14:03 +08:00
Marvin Zhang
0e21e4deea Merge pull request #95 from tikazyq/develop
Develop
2019-07-31 20:11:18 +08:00
Marvin Zhang
d9c18e2d5a added jenkins badge 2019-07-31 20:06:37 +08:00
Marvin Zhang
ad60da80b2 added jenkins 2019-07-31 19:46:55 +08:00
Marvin Zhang
23297bec1a updated config.yml 2019-07-31 19:45:43 +08:00
Marvin Zhang
6eecc7c0ec updated Jenkinsfile 2019-07-31 19:38:03 +08:00
Marvin Zhang
7d53ed7694 updated Jenkinsfile 2019-07-31 17:13:48 +08:00
Marvin Zhang
5d25c50db7 updated Jenkinsfile 2019-07-31 17:01:17 +08:00
Marvin Zhang
fa14daaf83 Merge pull request #94 from wo10378931/master
update 配置文件Redis初始密码为空
2019-07-31 16:09:15 +08:00
陈景阳
6492e3502a update 配置文件Redis初始密码为空 2019-07-31 16:03:33 +08:00
Marvin Zhang
732449228b Merge pull request #92 from wo10378931/master
FIX redis连接问题
2019-07-31 15:26:43 +08:00
陈景阳
4f5352fc57 fix redis连接问题 2019-07-31 14:35:36 +08:00
Marvin Zhang
6aec901aea updated Jenkinsfile 2019-07-31 13:34:22 +08:00
Marvin Zhang
9bbd30faf5 updated Jenkinsfile 2019-07-31 13:29:56 +08:00
Marvin Zhang
a12a09513a Merge pull request #91 from tikazyq/develop
Develop
v0.3.0
2019-07-31 13:11:49 +08:00
Marvin Zhang
e47769c889 updated favicon.ico 2019-07-31 13:10:58 +08:00
Marvin Zhang
c8f1361b96 code cleanup 2019-07-31 12:31:25 +08:00
Marvin Zhang
56ab47bd98 updated README 2019-07-31 12:29:33 +08:00
Marvin Zhang
d5dbb1a4ef updated README 2019-07-31 12:23:47 +08:00
Marvin Zhang
42226e98e0 updated README 2019-07-31 12:22:40 +08:00
暗音
a17c846aed Merge pull request #1 from tikazyq/master
更新源库
2019-07-31 08:56:43 +08:00
Marvin Zhang
cdd1766f3d updated README.md 2019-07-30 23:07:30 +08:00
Marvin Zhang
3f872dcdb2 Merge pull request #90 from tikazyq/develop
Develop
2019-07-30 22:51:48 +08:00
Marvin Zhang
9aad0ef8d1 updated CHANGELOG.md 2019-07-30 22:48:01 +08:00
Marvin Zhang
321aba2c76 removed python code 2019-07-30 22:25:00 +08:00
Marvin Zhang
7599f5d37a Merge pull request #89 from tikazyq/develop
Develop
2019-07-30 20:16:59 +08:00
Marvin Zhang
404b3fee02 Merge branch 'develop' of github.com:tikazyq/crawlab into develop 2019-07-30 20:16:07 +08:00
Marvin Zhang
312c565b18 updated docker-compose.yml 2019-07-30 20:15:49 +08:00
Marvin Zhang
e322060c08 Merge pull request #88 from wo10378931/master
FIX Node节点删除问题
2019-07-30 17:13:45 +08:00