553 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
pycook	398fbb25dc	merge Dockerfile	2019-11-12 10:40:37 +08:00
pycook	4b312d4f99	delete docs/Dockerfile 1.0	2019-11-11 23:12:50 +08:00
pycook	10414155a5	fix timezone	2019-11-11 23:11:12 +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	08c96039e9	gunicorn==19.5.0	2019-11-10 19:10:23 +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	2cfea7ef08	Update README.md ... docker 一键安装说明补充	2019-11-08 15:26:22 +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