Commit Graph

166 Commits

Author SHA1 Message Date
pycook
d95a0b0b56 fix acl api 2019-11-24 16:35:28 +08:00
kdyq007
51d72e8a1a [更新] 完成权限管理 2019-11-24 15:40:38 +08:00
kdyq007
eb55cdce14 [更新] 完成权限管理页面 2019-11-24 15:22:18 +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
kdyq007
a8f898e09b [更新] 完成资源类型页面 2019-11-23 20:16:31 +08:00
kdyq007
1dc80f471a [保存] 完成资源类型权限显示 2019-11-23 18:08:52 +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
7e687cc792 [更新] 保存一下 2019-11-20 19:02:36 +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
kdyq007
0c29c9160a [更新] 去除app_id 2019-11-18 22:22:38 +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
bc52f6c2a7 [更新] 完成角色管理页面 2019-11-17 21:08:04 +08:00
kdyq007
712a102f53 [更新] 完成roles基本接口 2019-11-17 17:09:24 +08:00
qiqi
7737469da1 [更新] 完成用户管理页面 2019-11-17 09:32:39 +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
f5002d8650 Merge pull request #18 from kdyq007/master
[更新] 修改图片路径、压缩图片
2019-11-14 21:59:38 +08:00
qiqi
daec5286bb [更新] 优化格式 2019-11-14 21:51:58 +08:00
qiqi
163d84f69e [更新] 更换图片位置、压缩图片 2019-11-14 21:48:36 +08:00
qiqi
59f8dea1b1 [更新] 优化说明文件格式 2019-11-14 21:00:24 +08:00
qiqi
e28048ac4f [更新] 新增Q群 README.md 2019-11-14 20:55:48 +08:00
pycook
5b80ba34b1 update acl 2019-11-14 18:35:31 +08:00
pycook
8b2d489d15 update readme 2019-11-13 14:02:02 +08:00
pycook
6296dc1feb python3.7 timezone fix 2019-11-13 13:56:44 +08:00
pycook
a3a12b8664 update acl 2019-11-13 13:25:42 +08:00
pycook
755af3436d docker images use aliyun 2019-11-13 11:56:17 +08:00
pycook
8b199df320 update Makefile and support for install by make 2019-11-12 11:55:04 +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
66320d63c1 delete docs/Dockerfile 2019-11-11 23:12:50 +08:00
pycook
40e76d6060 fix timezone 2019-11-11 23:11:12 +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