7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-10-31 11:09:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
412 Commits 14 Branches 41 Tags
e390b1ed7c7c63c0608ea09e94b9a2c06c9c821a
Commit Graph

412 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pycook
e390b1ed7c fix delete choice values 2023-08-31 15:18:15 +08:00
wang-liang0615
ce5884b2b9 Merge pull request #165 from veops/dev_ui 
proxy
 2023-08-31 13:31:26 +08:00
wang-liang0615
7700afdf1c proxy 2023-08-31 13:28:15 +08:00
pycook
771439e008 Merge pull request #162 from simontigers/cmdb_icon_manage 
feat: add cmdb custom icon manage
 2023-08-31 11:15:09 +08:00
pycook
7918b81f33 Merge pull request #163 from veops/dev_ui 
支持上传自定义图标
 2023-08-31 11:14:42 +08:00
hu.sima
9547fce484 feat: add cmdb custom icon manage 2023-08-31 10:49:56 +08:00
wang-liang0615
d25c3760a1 支持上传自定义图标 2023-08-31 10:05:11 +08:00
pycook
6df845d662 fix update attribute 2023-08-30 13:34:10 +08:00
pycook
0ac5b9cfe4 Merge branch 'master' of github.com:veops/cmdb 2023-08-29 14:49:21 +08:00
pycook
f74fd2ea8f The default value of USE_ACL is set to True 2023-08-29 14:49:09 +08:00
pycook
1e4033d0a6 Merge pull request #161 from simontigers/common_setting_format 
fix: company info create
 2023-08-29 11:01:25 +08:00
hu.sima
6ce139bec3 fix: company info create 2023-08-29 10:56:48 +08:00
pycook
d763edc6bf Merge branch 'master' of github.com:veops/cmdb 2023-08-25 11:01:24 +08:00
pycook
11fe5ca457 update ad_ci when deleting ci 2023-08-25 10:59:38 +08:00
wang-liang0615
57b1b5fb67 Merge pull request #160 from veops/dev_ui 
前端更新
 2023-08-25 10:12:31 +08:00
wang-liang0615
349ddbd98a fix 新增类型回车键发送两次请求 2023-08-25 10:11:09 +08:00
wang-liang0615
700c411ec3 fix 新增类型回车键发送两次请求 2023-08-25 10:08:04 +08:00
pycook
4d36d448a7 Merge pull request #158 from EvanSung/perf_20230824_optimize_ad_ci_relation 
perf(ad_ci_relation): optimize ad_ci relation
 2023-08-24 16:26:43 +08:00
EvanSung
0f1cb01f05 perf(ad_ci_relation): optimize ad_ci relation 2023-08-24 14:16:12 +08:00
pycook
7e06713b87 docker-compose add flask db-setup 2023-08-24 11:32:09 +08:00
pycook
41ee3b7f87 vxe-table-plugin-export-xlsx==2.0.0 2023-08-24 11:06:28 +08:00
pycook
36910d0052 add config CACHE_REDIS_PASSWORD and fix delete ci_type 2023-08-23 18:05:28 +08:00
pycook
52578d78d6 fix update ci 2023-08-22 11:34:40 +08:00
pycook
9b563f7b57 Register api and commands with absolute paths 2023-08-21 20:08:23 +08:00
pycook
96187bcd47 fix merge conflict 2023-08-21 11:55:49 +08:00
pycook
1ba3f85f7e fix g.user 2023-08-21 11:54:33 +08:00
pycook
3071983d6b version: 2.3.1 2023-08-20 11:24:53 +08:00
pycook
836892d909 lint 2023-08-20 11:23:55 +08:00
pycook
a24ba8f7cd Merge pull request #157 from EvanSung/fix_20230817_guser_issue 
fix(acl): g user issue
 2023-08-17 22:12:45 +08:00
EvanSung
d0d68c613b fix(acl): g user issue 2023-08-17 18:40:45 +08:00
pycook
9b976675c0 fix MyJSONEncoder 2023-08-16 21:28:27 +08:00
pycook
2200b122f0 Merge pull request #155 from veops/dev_ui 
前端更新
 2023-08-16 13:01:13 +08:00
pycook
190e82efe9 Merge branch 'master' of github.com:veops/cmdb 2023-08-16 13:00:44 +08:00
pycook
1dae48c583 Delete user without soft delete 2023-08-16 13:00:30 +08:00
wang-liang0615
5c25433e03 Merge branch 'master' of github.com:veops/cmdb into dev_ui 2023-08-16 10:09:47 +08:00
wang-liang0615
f8e94b7c70 delete user 2023-08-16 10:09:25 +08:00
pycook
c64610e9ea Merge pull request #154 from simontigers/common_setting_format 
fix: init-import-user-from-acl
 2023-08-15 20:47:36 +08:00
hu.sima
3f49586c9f fix: init-import-user-from-acl 2023-08-15 20:45:28 +08:00
pycook
91b886d632 Merge pull request #153 from simontigers/common_setting_format 
fix: import_user_from_acl
 2023-08-15 20:25:09 +08:00
hu.sima
7740031bd8 fix: import_user_from_acl 2023-08-15 20:19:45 +08:00
pycook
76a41a8e82 Merge branch 'master' of github.com:veops/cmdb 2023-08-15 19:48:11 +08:00
pycook
6843eb57c4 [update] delete roles, users, attributes 2023-08-15 19:47:59 +08:00
wang-liang0615
20caae8263 Merge pull request #152 from veops/dev_ui 
前端更新
 2023-08-15 19:47:03 +08:00
wang-liang0615
5e61da038f 属性库 2023-08-15 19:34:17 +08:00
wang-liang0615
348a34d862 属性库 2023-08-15 19:26:49 +08:00
wang-liang0615
2471af867a 属性库 2023-08-15 19:21:09 +08:00
wang-liang0615
775f65ba7b 属性库 2023-08-15 19:10:26 +08:00
wang-liang0615
ebd0b1dc2e 后台管理-模型关联 关系删除&&筛选 2023-08-15 15:02:46 +08:00
pycook
14b5119d94 update gitattributes 2023-08-15 13:41:45 +08:00
wang-liang0615
45167225c9 Merge pull request #150 from EvanSung/optimize_20230810_acl_resource_fe 
refactor(fe): reduce the width of resource mgt table
 2023-08-10 19:32:49 +08:00