Commit Graph

54 Commits

Author SHA1 Message Date
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
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 eaa5cb8bf1 update acl 2019-11-14 18:35:31 +08:00
pycook cb0eb7eadd update acl 2019-11-13 13:25:42 +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 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
pycook 618cd7ff16 vue lint 2019-11-11 00:25:22 +08:00
pycook 3fdfa4dc92 Docker to production 2019-11-10 19:06:38 +08:00
pycook 7da14f6aa0 Partially completed backend development of permissions management 2019-11-08 17:42:13 +08:00
pycook dc18e3b82f fix py2.7 unicode encoding error 2019-11-08 15:15:31 +08:00
pycook cb8ef65e79 users drop is_admin 2019-11-08 14:58:21 +08:00
pycook 341a4359fa fix unicode encode error 2019-11-08 14:37:53 +08:00
fxiang21 f89169de96 移除多余的docker-start目录 2019-11-08 09:20:34 +08:00
fxiang21 47767e22d8 修复nginx转发问题 2019-11-08 09:20:27 +08:00
fxiang21 5f389459e8 添加容器化部署方式 2019-11-08 09:20:09 +08:00
pycook 02ea6afa9c code format 2019-11-07 19:18:31 +08:00
pycook 538cc3debf fix add integer list 2019-11-01 11:27:24 +08:00
pycook c80291a1b3 fix date picker 2019-10-24 20:43:59 +08:00
pycook 77ad772d95 attribute alias must be unique 2019-10-24 20:43:58 +08:00
pycook 174375d3bf fix attributes paginate 2019-10-24 20:43:54 +08:00
pycook f592af0ff4 attributes paginate and fix update value 2019-10-24 20:43:51 +08:00