53 Commits

Author	SHA1	Message	Date
pycook	af476aebc0	/acl/resources add param resource_type_id	2019-11-24 22:33:57 +08:00
kdyq007	4fbeb48799	Merge pull request #6 from pycook/master ... fix acl api	2019-11-24 16:43:53 +08:00
pycook	d95a0b0b56	fix acl api	2019-11-24 16:35:28 +08:00
kdyq007	6b532d9713	Merge pull request #5 from pycook/master ... 同步	2019-11-23 21:53:46 +08:00
pycook	b8c2b23d2e	fix	2019-11-23 21:50:45 +08:00
pycook	78a7801791	fix acl resource	2019-11-23 17:42:33 +08:00
kdyq007	ac97e4447b	Merge pull request #4 from pycook/master ... fix acl resource_type	2019-11-23 17:36:42 +08:00
pycook	59c00e63d6	fix acl resource_type	2019-11-23 17:24:43 +08:00
kdyq007	f71505f13e	Merge pull request #3 from pycook/master ... 同步	2019-11-23 14:52:41 +08:00
pycook	0247b729b7	relative view api [done]	2019-11-22 18:18:22 +08:00
pycook	14ccef56bc	Realize /api/v0.1/ci_relations/s [done]	2019-11-21 18:21:03 +08:00
kdyq007	b43132ff28	Merge branch 'master' of https://github.com/kdyq007/cmdb	2019-11-19 21:52:33 +08:00
kdyq007	edcbc98de2	Merge pull request #2 from pycook/master ... update	2019-11-19 21:52:02 +08:00
kdyq007	d2df87bf2d	[更新] 完成基础role和user管理	2019-11-19 21:49:51 +08:00
pycook	8661546582	fix get user by uid	2019-11-19 21:46:53 +08:00
pycook	39f991d528	acl: resource type api	2019-11-19 21:41:46 +08:00
pycook	25bcbb336d	fix search	2019-11-19 18:32:35 +08:00
pycook	179c8f1f0e	elastic search [done]	2019-11-19 18:16:31 +08:00
pycook	bdc814aa15	es search update	2019-11-18 22:05:59 +08:00
pycook	42ef98af36	search by elasticsearch [doing]	2019-11-18 20:02:25 +08:00
kdyq007	8a8378b2e4	Merge pull request #1 from pycook/master ... 怎么玩的？反向pull request	2019-11-18 18:31:14 +08:00
pycook	00abaa4bbd	fix acl api	2019-11-18 12:02:02 +08:00
kdyq007	712a102f53	[更新] 完成roles基本接口	2019-11-17 17:09:24 +08:00
pycook	dc9cb6dc5a	pep8	2019-11-15 18:03:06 +08:00
pycook	e437996df6	update acl	2019-11-15 16:54:56 +08:00
pycook	5b80ba34b1	update acl	2019-11-14 18:35:31 +08:00
pycook	a3a12b8664	update acl	2019-11-13 13:25:42 +08:00
pycook	d6bf4fe7e3	fix py3	2019-11-12 11:15:25 +08:00
pycook	af411eb562	merge Dockerfile	2019-11-12 10:40:37 +08:00
pycook	3850f366c8	update README	2019-11-11 16:10:02 +08:00
pycook	ba0f2043ca	flask init-cache	2019-11-11 15:46:57 +08:00
pycook	9798e99eb7	Remove package-lock.json and remove some compile warnings	2019-11-11 13:16:07 +08:00
pycook	6aa6c8589d	add command init-cache	2019-11-11 11:27:43 +08:00
pycook	22a23cf220	Merge branch 'master' of https://github.com/pycook/cmdb	2019-11-11 09:20:07 +08:00
pycook	c22f06783c	vue lint	2019-11-11 00:25:22 +08:00
pycook	d1b8408c59	Docker to production	2019-11-10 19:06:38 +08:00
pycook	977712157e	Partially completed backend development of permissions management	2019-11-08 17:42:13 +08:00
pycook	15072ebfd0	fix py2.7 unicode encoding error	2019-11-08 15:15:31 +08:00
pycook	0b92fcc2e1	users drop is_admin	2019-11-08 14:58:21 +08:00
pycook	cfe49c373a	fix unicode encode error	2019-11-08 14:37:53 +08:00
fxiang21	5f272fc561	移除多余的docker-start目录	2019-11-08 09:20:34 +08:00
fxiang21	b1712f43ec	修复nginx转发问题	2019-11-08 09:20:27 +08:00
fxiang21	e0e048572f	添加容器化部署方式	2019-11-08 09:20:09 +08:00
pycook	a9069860ed	code format	2019-11-07 19:18:31 +08:00
pycook	b0b994a96b	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
pycook	a0fcbd220e	attributes paginate and fix update value	2019-10-24 20:43:51 +08:00
pycook	620c5bb5eb	ci search return unique key	2019-10-24 20:43:51 +08:00