7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
491 Commits 14 Branches 38 Tags 93 MiB
Commit Graph

491 Commits

Author SHA1 Message Date
wang-liang0615 740aae573e sub menu color 2023-09-04 16:33:35 +08:00
wang-liang0615 17828a7631
Merge pull request #166 from veops/dev_ui 
ui更新
 2023-09-04 13:15:27 +08:00
wang-liang0615 02cb497bdc Merge branch 'master' of github.com:veops/cmdb into dev_ui 2023-09-04 13:14:35 +08:00
wang-liang0615 05a7dc41ee sidebar 2023-09-04 13:14:11 +08:00
pycook 459c70ba2d import format 2023-09-02 12:09:41 +08:00
pycook 774f42ac34 format 2023-09-01 18:07:44 +08:00
pycook 420029a5e2 fix delete choice values 2023-08-31 16:02:24 +08:00
pycook ab8acbfd20 fix delete choice values 2023-08-31 15:18:15 +08:00
wang-liang0615 4468b6a8de
Merge pull request #165 from veops/dev_ui 
proxy
 2023-08-31 13:31:26 +08:00
wang-liang0615 6bf145d085 proxy 2023-08-31 13:28:15 +08:00
pycook 42b1e47e76
Merge pull request #162 from simontigers/cmdb_icon_manage 
feat: add cmdb custom icon manage
 2023-08-31 11:15:09 +08:00
pycook 673134003a
Merge pull request #163 from veops/dev_ui 
支持上传自定义图标
 2023-08-31 11:14:42 +08:00
hu.sima ef67885571 feat: add cmdb custom icon manage 2023-08-31 10:49:56 +08:00
wang-liang0615 075bf7217f 支持上传自定义图标 2023-08-31 10:05:11 +08:00
pycook 3b7b8f435c fix update attribute 2023-08-30 13:34:10 +08:00
pycook 2b7f6aeef3 Merge branch 'master' of github.com:veops/cmdb 2023-08-29 14:49:21 +08:00
pycook 544fac8aca The default value of USE_ACL is set to True 2023-08-29 14:49:09 +08:00
pycook 3d0a56ec8c
Merge pull request #161 from simontigers/common_setting_format 
fix: company info create
 2023-08-29 11:01:25 +08:00
hu.sima d2d8482052 fix: company info create 2023-08-29 10:56:48 +08:00
pycook a0afae8d2e Merge branch 'master' of github.com:veops/cmdb 2023-08-25 11:01:24 +08:00
pycook 9f3da68636 update ad_ci when deleting ci 2023-08-25 10:59:38 +08:00
wang-liang0615 24b955c288
Merge pull request #160 from veops/dev_ui 
前端更新
 2023-08-25 10:12:31 +08:00
wang-liang0615 a07b2d37ec fix 新增类型回车键发送两次请求 2023-08-25 10:11:09 +08:00
wang-liang0615 c86fcb4e7b fix 新增类型回车键发送两次请求 2023-08-25 10:08:04 +08:00
pycook ca7964f24b
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 c42ac634fb perf(ad_ci_relation): optimize ad_ci relation 2023-08-24 14:16:12 +08:00
pycook a6fc3341ce docker-compose add flask db-setup 2023-08-24 11:32:09 +08:00
pycook fc3f2e25f3 vxe-table-plugin-export-xlsx==2.0.0 2023-08-24 11:06:28 +08:00
pycook 511a5f70c6 add config CACHE_REDIS_PASSWORD and fix delete ci_type 2023-08-23 18:05:28 +08:00
pycook f8ff4d5e45 fix update ci 2023-08-22 11:34:40 +08:00
pycook 3ab72cceaf Register api and commands with absolute paths 2023-08-21 20:08:23 +08:00
pycook 4ab7e3c70c fix merge conflict 2023-08-21 11:55:49 +08:00
pycook a7fe75f7df fix g.user 2023-08-21 11:54:33 +08:00
pycook 3474a71a75 version: 2.3.1 2023-08-20 11:24:53 +08:00
pycook 6531baff64 lint 2023-08-20 11:23:55 +08:00
pycook ed5936250f
Merge pull request #157 from EvanSung/fix_20230817_guser_issue 
fix(acl): g user issue
 2023-08-17 22:12:45 +08:00
EvanSung 52c32e2ab1 fix(acl): g user issue 2023-08-17 18:40:45 +08:00
pycook d3224625b6 fix MyJSONEncoder 2023-08-16 21:28:27 +08:00
pycook f158c7e33a
Merge pull request #155 from veops/dev_ui 
前端更新
 2023-08-16 13:01:13 +08:00
pycook 6dc12bb6ac Merge branch 'master' of github.com:veops/cmdb 2023-08-16 13:00:44 +08:00
pycook b33ae16c00 Delete user without soft delete 2023-08-16 13:00:30 +08:00
wang-liang0615 2caffc2670 Merge branch 'master' of github.com:veops/cmdb into dev_ui 2023-08-16 10:09:47 +08:00
wang-liang0615 f28af51007 delete user 2023-08-16 10:09:25 +08:00
pycook 3a0369559f
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 a74a2c5a94 fix: init-import-user-from-acl 2023-08-15 20:45:28 +08:00
pycook 9fbcb2838e
Merge pull request #153 from simontigers/common_setting_format 
fix: import_user_from_acl
 2023-08-15 20:25:09 +08:00
hu.sima 60a445b972 fix: import_user_from_acl 2023-08-15 20:19:45 +08:00
pycook bfdd7b6a0e Merge branch 'master' of github.com:veops/cmdb 2023-08-15 19:48:11 +08:00
pycook ab093d2493 [update] delete roles, users, attributes 2023-08-15 19:47:59 +08:00
wang-liang0615 315a578a31
Merge pull request #152 from veops/dev_ui 
前端更新
 2023-08-15 19:47:03 +08:00