106 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
pycook	f7b94dbe6e	change to GPLv2	2019-11-25 20:33:56 +08:00
pycook	92cb9633b0	License change to GPLv3	2019-11-25 19:42:37 +08:00
pycook	2f3b5a03ee	UI: relation type define [done]	2019-11-25 19:23:51 +08:00
pycook	47cfce7ee9	/acl/resources add param resource_type_id	2019-11-24 22:33:57 +08:00
pycook	2210e9715b	Merge pull request #20 from kdyq007/master ... [更新] 新增角色、资源、权限页面	2019-11-24 17:29:58 +08:00
kdyq007	0151e0ff56	Merge branch 'master' of https://github.com/kdyq007/cmdb	2019-11-24 17:21:27 +08:00
kdyq007	bc63548dd8	Merge pull request #6 from pycook/master ... fix acl api	2019-11-24 16:43:53 +08:00
pycook	39aaa916dc	fix acl api	2019-11-24 16:35:28 +08:00
kdyq007	43bacef520	Merge pull request #5 from pycook/master ... 同步	2019-11-23 21:53:46 +08:00
pycook	a822503b67	fix	2019-11-23 21:50:45 +08:00
pycook	77ed1ddb28	fix acl resource	2019-11-23 17:42:33 +08:00
kdyq007	2d17e29441	Merge pull request #4 from pycook/master ... fix acl resource_type	2019-11-23 17:36:42 +08:00
pycook	6c4eefa9c0	fix acl resource_type	2019-11-23 17:24:43 +08:00
kdyq007	a492f97199	Merge pull request #3 from pycook/master ... 同步	2019-11-23 14:52:41 +08:00
pycook	4c7deee866	relative view api [done]	2019-11-22 18:18:22 +08:00
pycook	31a97d7ad0	Realize /api/v0.1/ci_relations/s [done]	2019-11-21 18:21:03 +08:00
kdyq007	c2e4090aea	Merge branch 'master' of https://github.com/kdyq007/cmdb	2019-11-19 21:52:33 +08:00
kdyq007	40e49aa1e9	Merge pull request #2 from pycook/master ... update	2019-11-19 21:52:02 +08:00
kdyq007	0bf8bfb113	[更新] 完成基础role和user管理	2019-11-19 21:49:51 +08:00
pycook	bc7b51c544	fix get user by uid	2019-11-19 21:46:53 +08:00
pycook	1c6d056d58	acl: resource type api	2019-11-19 21:41:46 +08:00
pycook	f3a0761ffc	fix search	2019-11-19 18:32:35 +08:00
pycook	2ce8a6bdbf	elastic search [done]	2019-11-19 18:16:31 +08:00
pycook	7ae58611c0	es search update	2019-11-18 22:05:59 +08:00
pycook	4ec3b310e4	search by elasticsearch [doing]	2019-11-18 20:02:25 +08:00
kdyq007	bd34023512	Merge pull request #1 from pycook/master ... 怎么玩的？反向pull request	2019-11-18 18:31:14 +08:00
pycook	2205c359b8	fix acl api	2019-11-18 12:02:02 +08:00
kdyq007	2723f187ac	[更新] 完成roles基本接口	2019-11-17 17:09:24 +08:00
pycook	bb91f21e40	pep8	2019-11-15 18:03:06 +08:00
pycook	f1c2bcbd79	update acl	2019-11-15 16:54:56 +08:00
pycook	a8255d2b69	Merge pull request #18 from kdyq007/master ... [更新] 修改图片路径、压缩图片	2019-11-14 21:59:38 +08:00
qiqi	22c02f94e0	[更新] 优化格式	2019-11-14 21:51:58 +08:00
qiqi	e1a5c01438	[更新] 更换图片位置、压缩图片	2019-11-14 21:48:36 +08:00
qiqi	fd21dfe94d	[更新] 优化说明文件格式	2019-11-14 21:00:24 +08:00
qiqi	4bc6492b21	[更新] 新增Q群 README.md	2019-11-14 20:55:48 +08:00
pycook	eaa5cb8bf1	update acl	2019-11-14 18:35:31 +08:00
pycook	47c66be179	update readme	2019-11-13 14:02:02 +08:00
pycook	089a17ded8	python3.7 timezone fix	2019-11-13 13:56:44 +08:00
pycook	cb0eb7eadd	update acl	2019-11-13 13:25:42 +08:00
pycook	82a402883b	docker images use aliyun	2019-11-13 11:56:17 +08:00
pycook	00f6e8e7d9	update Makefile and support for install by make	2019-11-12 11:55:04 +08:00
pycook	63cae8510f	fix py3	2019-11-12 11:15:25 +08:00
pycook	62b56da0d8	merge Dockerfile	2019-11-12 10:40:37 +08:00
pycook	79a19d4b49	delete docs/Dockerfile	2019-11-11 23:12:50 +08:00
pycook	f91c82b241	fix timezone	2019-11-11 23:11:12 +08:00
pycook	89ffec35e8	update README	2019-11-11 16:10:02 +08:00
pycook	2935ca5923	flask init-cache	2019-11-11 15:46:57 +08:00
pycook	46213dd758	Remove package-lock.json and remove some compile warnings	2019-11-11 13:16:07 +08:00
pycook	aee66c075b	add command init-cache	2019-11-11 11:27:43 +08:00
pycook	29e80f8597	Merge branch 'master' of https://github.com/pycook/cmdb	2019-11-11 09:20:07 +08:00