523 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
pycook	4d11c1f7db	License change to GPLv3	2019-11-25 19:42:37 +08:00
pycook	0a563deb11	UI: relation type define [done]	2019-11-25 19:23:51 +08:00
pycook	ba80ec4403	/acl/resources add param resource_type_id	2019-11-24 22:33:57 +08:00
pycook	3b7cc4595b	fix grant	2019-11-24 22:29:51 +08:00
pycook	9fe47657a6	Merge pull request #20 from kdyq007/master ... [更新] 新增角色、资源、权限页面	2019-11-24 17:29:58 +08:00
kdyq007	5a4a6caa07	Merge branch 'master' of https://github.com/kdyq007/cmdb	2019-11-24 17:21:27 +08:00
kdyq007	9dadbe1599	Merge pull request #6 from pycook/master ... fix acl api	2019-11-24 16:43:53 +08:00
pycook	40d016f513	fix acl api	2019-11-24 16:35:28 +08:00
kdyq007	655edaa7c8	[更新] 完成权限管理	2019-11-24 15:40:38 +08:00
kdyq007	7fa5cff919	[更新] 完成权限管理页面	2019-11-24 15:22:18 +08:00
kdyq007	d19834ed5d	Merge pull request #5 from pycook/master ... 同步	2019-11-23 21:53:46 +08:00
pycook	b6be430aa3	fix	2019-11-23 21:50:45 +08:00
kdyq007	63792c242f	[更新] 完成资源类型页面	2019-11-23 20:16:31 +08:00
kdyq007	10f7029722	[保存] 完成资源类型权限显示	2019-11-23 18:08:52 +08:00
pycook	ba176542dc	fix acl resource	2019-11-23 17:42:33 +08:00
kdyq007	aae3b6e2ff	Merge pull request #4 from pycook/master ... fix acl resource_type	2019-11-23 17:36:42 +08:00
pycook	b370c7d46e	fix acl resource_type	2019-11-23 17:24:43 +08:00
kdyq007	efa5a8ea5d	Merge pull request #3 from pycook/master ... 同步	2019-11-23 14:52:41 +08:00
pycook	fd532626ac	relative view api [done]	2019-11-22 18:18:22 +08:00
pycook	617337c614	Realize /api/v0.1/ci_relations/s [done]	2019-11-21 18:21:03 +08:00
kdyq007	9a3d24ac81	[更新] 保存一下	2019-11-20 19:02:36 +08:00
kdyq007	454dd4c56b	Merge branch 'master' of https://github.com/kdyq007/cmdb	2019-11-19 21:52:33 +08:00
kdyq007	88ad72d4dc	Merge pull request #2 from pycook/master ... update	2019-11-19 21:52:02 +08:00
kdyq007	8d1517d550	[更新] 完成基础role和user管理	2019-11-19 21:49:51 +08:00
pycook	d3a8ef5966	fix get user by uid	2019-11-19 21:46:53 +08:00
pycook	e5baa5012d	acl: resource type api	2019-11-19 21:41:46 +08:00
pycook	a1f63b00dd	fix search	2019-11-19 18:32:35 +08:00
pycook	47ded84231	elastic search [done]	2019-11-19 18:16:31 +08:00
kdyq007	224a48a5f3	[更新] 去除app_id	2019-11-18 22:22:38 +08:00
pycook	0e7c52df71	es search update	2019-11-18 22:05:59 +08:00
pycook	ff701cc770	search by elasticsearch [doing]	2019-11-18 20:02:25 +08:00
kdyq007	6a7bb725cc	Merge pull request #1 from pycook/master ... 怎么玩的？反向pull request	2019-11-18 18:31:14 +08:00
pycook	0a13186c13	fix acl api	2019-11-18 12:02:02 +08:00
kdyq007	a0ffeb9950	[更新] 完成角色管理页面	2019-11-17 21:08:04 +08:00
kdyq007	6c70ec6d53	[更新] 完成roles基本接口	2019-11-17 17:09:24 +08:00
qiqi	4b5f82699a	[更新] 完成用户管理页面	2019-11-17 09:32:39 +08:00
pycook	f78c3b928b	pep8	2019-11-15 18:03:06 +08:00
pycook	332659c1d5	update acl	2019-11-15 16:54:56 +08:00
pycook	3beb2706dc	Merge pull request #18 from kdyq007/master ... [更新] 修改图片路径、压缩图片	2019-11-14 21:59:38 +08:00
qiqi	a14111e1ce	[更新] 优化格式	2019-11-14 21:51:58 +08:00
qiqi	c4320c14f9	[更新] 更换图片位置、压缩图片	2019-11-14 21:48:36 +08:00
qiqi	4c5442748f	[更新] 优化说明文件格式	2019-11-14 21:00:24 +08:00
qiqi	a81750acba	[更新] 新增Q群 README.md	2019-11-14 20:55:48 +08:00
pycook	0439e2462b	update acl	2019-11-14 18:35:31 +08:00
pycook	3b62bd7ac9	update readme	2019-11-13 14:02:02 +08:00
pycook	f6add52721	python3.7 timezone fix	2019-11-13 13:56:44 +08:00
pycook	c85e535288	update acl	2019-11-13 13:25:42 +08:00
pycook	c0c6d116b5	docker images use aliyun	2019-11-13 11:56:17 +08:00
pycook	39153e92d1	update Makefile and support for install by make	2019-11-12 11:55:04 +08:00
pycook	42bcc2e510	fix py3	2019-11-12 11:15:25 +08:00