6176 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
陈景阳	931e9a1d21	fix 冲突	2020-01-07 00:35:56 +08:00
陈景阳	06f913f265	fix 冲突	2020-01-07 00:35:56 +08:00
marvzhang	aed16d3edb	updated badges	2020-01-06 21:49:58 +08:00
marvzhang	abe750b48b	updated badges	2020-01-06 21:49:58 +08:00
marvzhang	fa4e1af1b0	updated badges	2020-01-06 21:43:16 +08:00
marvzhang	dca808ecce	updated badges	2020-01-06 21:43:16 +08:00
marvzhang	3cfe5c8668	updated badges	2020-01-06 21:41:53 +08:00
marvzhang	4fdd779b45	updated badges	2020-01-06 21:41:53 +08:00
marvzhang	ee0fd649cf	updated badges	2020-01-06 21:40:11 +08:00
marvzhang	1622e0e83a	updated badges	2020-01-06 21:40:11 +08:00
marvzhang	fab288034d	updated badges	2020-01-06 21:33:18 +08:00
marvzhang	caf11dfe51	updated badges	2020-01-06 21:33:18 +08:00
marvzhang	bc616cdb18	updated README	2020-01-06 21:12:41 +08:00
marvzhang	978c193f6b	updated README	2020-01-06 21:12:41 +08:00
marvzhang	4145cbf011	added CHANGELOG	2020-01-06 17:17:04 +08:00
marvzhang	560f2f14df	added CHANGELOG	2020-01-06 17:17:04 +08:00
marvzhang	a0c0c4756c	updated package.json version	2020-01-06 16:42:52 +08:00
marvzhang	83438d140a	updated package.json version	2020-01-06 16:42:52 +08:00
marvzhang	d7e2270765	added CHANGELOG-zh.md	2020-01-06 16:42:01 +08:00
marvzhang	c144ea14ac	added CHANGELOG-zh.md	2020-01-06 16:42:01 +08:00
marvzhang	04905f38b5	加入爬虫列表排序	2020-01-06 13:18:29 +08:00
marvzhang	2c3f440c8e	加入爬虫列表排序	2020-01-06 13:18:29 +08:00
marvzhang	029c95498a	加入百度统计	2020-01-06 12:55:30 +08:00
marvzhang	550a4e95b3	加入百度统计	2020-01-06 12:55:30 +08:00
marvzhang	a369a2250c	加入百度统计	2020-01-06 12:50:41 +08:00
marvzhang	573a5a1d05	加入百度统计	2020-01-06 12:50:41 +08:00
marvzhang	116d5d1fe1	Merge remote-tracking branch 'origin/develop' into develop	2020-01-06 12:36:30 +08:00
marvzhang	e566031459	Merge remote-tracking branch 'origin/develop' into develop	2020-01-06 12:36:30 +08:00
marvzhang	fafdccecf7	定时任务优化: 加入启用/禁用	2020-01-06 12:35:56 +08:00
marvzhang	160462cbdc	定时任务优化: 加入启用/禁用	2020-01-06 12:35:56 +08:00
marvzhang	877289e382	fixed https://github.com/crawlab-team/crawlab/issues/423	2020-01-06 12:35:17 +08:00
marvzhang	a74b949d8d	fixed https://github.com/crawlab-team/crawlab/issues/423	2020-01-06 12:35:17 +08:00
Marvin Zhang	f1129aa1a3	Merge pull request #422 from hantmac/develop ... Add Unique index for 'key'	2020-01-04 17:52:00 +08:00
Marvin Zhang	70500e56d6	Merge pull request #422 from hantmac/develop ... Add Unique index for 'key'	2020-01-04 17:52:00 +08:00
hantmac	c88c3abf85	Add Unique index for 'key'	2020-01-04 17:29:05 +08:00
hantmac	88ea26b3df	Add Unique index for 'key'	2020-01-04 17:29:05 +08:00
hantmac	8e30d1b3dd	Merge remote-tracking branch 'crawlab-team/develop' into develop	2020-01-04 13:55:27 +08:00
hantmac	c9839ac96a	Merge remote-tracking branch 'crawlab-team/develop' into develop	2020-01-04 13:55:27 +08:00
marvzhang	b98240fab6	updated CHANGELOG.md	2020-01-03 17:24:57 +08:00
marvzhang	7aabde8bcb	updated CHANGELOG.md	2020-01-03 17:24:57 +08:00
marvzhang	7835de2641	爬虫详情显示定时任务	2020-01-03 17:20:24 +08:00
marvzhang	44c0b050f7	爬虫详情显示定时任务	2020-01-03 17:20:24 +08:00
Marvin Zhang	fe8ae218d1	Merge pull request #420 from crawlab-team/develop ... Develop	2020-01-03 16:23:11 +08:00
Marvin Zhang	81c78ab1d2	Merge pull request #420 from crawlab-team/develop ... Develop	2020-01-03 16:23:11 +08:00
marvzhang	9374493fd2	updated version	2020-01-03 16:03:32 +08:00
marvzhang	a8c9fffa7a	updated version	2020-01-03 16:03:32 +08:00
marvzhang	9d310cf5d7	updated CHANGELOG.md	2020-01-03 16:02:56 +08:00
marvzhang	32b23a77f6	updated CHANGELOG.md	2020-01-03 16:02:56 +08:00
marvzhang	d6edc60062	updated docker-compose.yml	2020-01-03 15:50:59 +08:00
marvzhang	0f85117944	updated docker-compose.yml	2020-01-03 15:50:59 +08:00