55 Commits

Author	SHA1	Message	Date
pycook	73b92ff533	relation view define [done]	2019-11-27 18:25:53 +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
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	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
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	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
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	6c70ec6d53	[更新] 完成roles基本接口	2019-11-17 17:09:24 +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	0439e2462b	update acl	2019-11-14 18:35:31 +08:00
pycook	c85e535288	update acl	2019-11-13 13:25:42 +08:00
pycook	42bcc2e510	fix py3	2019-11-12 11:15:25 +08:00
pycook	398fbb25dc	merge Dockerfile	2019-11-12 10:40:37 +08:00
pycook	feda0c37e7	update README	2019-11-11 16:10:02 +08:00
pycook	173c120b64	flask init-cache	2019-11-11 15:46:57 +08:00
pycook	5f2a0d1a7b	Remove package-lock.json and remove some compile warnings	2019-11-11 13:16:07 +08:00
pycook	50f894a01d	add command init-cache	2019-11-11 11:27:43 +08:00
pycook	66e93e73af	Merge branch 'master' of https://github.com/pycook/cmdb	2019-11-11 09:20:07 +08:00
pycook	58ad9d3f05	vue lint	2019-11-11 00:25:22 +08:00
pycook	ca0dd97626	Docker to production	2019-11-10 19:06:38 +08:00
pycook	7810ee3974	Partially completed backend development of permissions management	2019-11-08 17:42:13 +08:00
pycook	0cee6cea25	fix py2.7 unicode encoding error	2019-11-08 15:15:31 +08:00
pycook	5d13ba2f26	users drop is_admin	2019-11-08 14:58:21 +08:00
pycook	a583433530	fix unicode encode error	2019-11-08 14:37:53 +08:00
fxiang21	733ac3b2b4	移除多余的docker-start目录	2019-11-08 09:20:34 +08:00
fxiang21	ef6300255a	修复nginx转发问题	2019-11-08 09:20:27 +08:00
fxiang21	aad37dcf0b	添加容器化部署方式	2019-11-08 09:20:09 +08:00
pycook	cce10d39ea	code format	2019-11-07 19:18:31 +08:00
pycook	1f8219b418	fix add integer list	2019-11-01 11:27:24 +08:00
pycook	9c7d51127a	fix date picker	2019-10-24 20:43:59 +08:00
pycook	7b96ac4638	attribute alias must be unique	2019-10-24 20:43:58 +08:00
pycook	0a36330852	fix attributes paginate	2019-10-24 20:43:54 +08:00