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

547 Commits

Author SHA1 Message Date
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
wang-liang0615 1e16dc5e5b 属性库 2023-08-15 19:34:17 +08:00
wang-liang0615 f67e196acf 属性库 2023-08-15 19:26:49 +08:00
wang-liang0615 439e25d5dd 属性库 2023-08-15 19:21:09 +08:00
wang-liang0615 ea59c0d71f 属性库 2023-08-15 19:10:26 +08:00
wang-liang0615 1137127aab 后台管理-模型关联 关系删除&&筛选 2023-08-15 15:02:46 +08:00
pycook 4ad1b5282e update gitattributes 2023-08-15 13:41:45 +08:00
wang-liang0615 cdd5e4d9aa
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
pycook 432de5e847
Merge pull request #148 from simontigers/common_setting_format 
fix: default arg value
 2023-08-10 19:31:18 +08:00
pycook 3a2339765a
Merge pull request #149 from veops/dev_ui 
ui更新：password
 2023-08-10 19:28:24 +08:00
EvanSung b5a2af7420 refactor(fe): reduce the width of resource mgt table 2023-08-10 19:23:41 +08:00
wang-liang0615 8b267613d6 Merge branch 'master' of github.com:veops/cmdb into dev_ui 2023-08-10 19:21:28 +08:00
wang-liang0615 b365eb27f6 增加密码明文传输 2023-08-10 19:21:10 +08:00
hu.sima 2125f020b5 fix: default arg value 2023-08-10 19:05:56 +08:00
pycook ea762e35a0
Merge pull request #147 from simontigers/common_setting_format 
fix: remove useless
 2023-08-10 19:01:25 +08:00
hu.sima f11aadf6d4 fix: remove useless 2023-08-10 18:55:32 +08:00
pycook 9cbf133b9f
Merge pull request #146 from simontigers/common_setting_format 
Common setting format
 2023-08-10 18:23:24 +08:00
hu.sima 95e8f9de74 fix: remove unused column 2023-08-10 16:29:52 +08:00
hu.sima 26792147ae style: format common setting 2023-08-10 15:30:01 +08:00
pycook 4f9b581c2e
Merge pull request #145 from EvanSung/optimize_20230810_auth_require 
optimize(auth): auth request json
 2023-08-10 11:24:23 +08:00
EvanSung e2b1cb3003 optimize(auth): auth request json 2023-08-10 10:43:59 +08:00
pycook f75a85b48a fix celery config 2023-08-08 16:33:24 +08:00
pycook 313fc80e54 Merge branch 'master' of github.com:veops/cmdb 2023-08-08 13:16:14 +08:00
pycook e0666689e5 upgrade celery 2023-08-08 13:16:07 +08:00
pycook 7a9fd4f9d6
Merge pull request #144 from veops/dev_ui 
UI更新：fix preferenceList=>attrList
 2023-08-08 09:21:10 +08:00
wang-liang0615 2fd706be85 Merge branch 'master' of github.com:veops/cmdb into dev_ui 2023-08-08 09:11:24 +08:00
wang-liang0615 3df51bb670 fix preferenceList=>attrList 2023-08-08 09:11:03 +08:00
pycook 9bbbcbe6dc upgrade flask to 2.3.2 and replace g.user with current_user 2023-08-06 21:54:18 +08:00
pycook 16d6b40e8d
Merge pull request #138 from lovvvve/fix_ldap 
fix ldap login
 2023-08-04 11:31:58 +08:00
pycook ef2d3812a2
Merge pull request #142 from veops/dev_ui 
ci 批量更新和删除的异步处理
 2023-08-04 09:27:55 +08:00
wang-liang0615 bc653efd04 Merge branch 'master' of github.com:veops/cmdb into dev_ui 2023-08-03 16:54:47 +08:00
wang-liang0615 d891d7365d ci 批量更新和删除的异步处理 2023-08-03 16:54:27 +08:00
pycook 9953b2fc98
Merge pull request #139 from EvanSung/fix-post-acltrigger-session-invalid 
fix(trigger): session invalid issue
 2023-08-02 19:33:05 +08:00
songbing01249 8de54812dc fix(trigger): session invalid issue 2023-08-02 18:22:42 +08:00
lovvvve eb7d52cf35 fix ldap login 2023-08-01 11:27:29 +00:00
pycook 6c4a5f2f6b
Merge pull request #134 from veops/dependabot/pip/cmdb-api/pillow-9.3.0 
Bump pillow from 9.2.0 to 9.3.0 in /cmdb-api
 2023-08-01 15:57:02 +08:00
pycook 17c5d4538b
Merge pull request #135 from simontigers/remove_pandas 
fix: remove pandas
 2023-08-01 15:55:15 +08:00
hu.sima 6c3e3f9eed fix: remove pandas 2023-08-01 15:32:44 +08:00
dependabot[bot] b0494adc17
Bump pillow from 9.2.0 to 9.3.0 in /cmdb-api 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.2.0 to 9.3.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/9.2.0...9.3.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-01 05:51:16 +00:00
pycook fc133f2ae9 Merge branch 'master' of github.com:veops/cmdb 2023-08-01 13:47:34 +08:00
pycook ac6e3a0318 fix dependabot alerts 2023-08-01 13:47:11 +08:00
pycook 404ec976cc fix dependabot alerts 2023-08-01 13:46:47 +08:00
pycook 4211bbcbc9
Merge pull request #130 from veops/dependabot/pip/cmdb-api/certifi-2023.7.22 
Bump certifi from 2023.5.7 to 2023.7.22 in /cmdb-api
 2023-08-01 13:14:25 +08:00
pycook 0158636671
Merge pull request #132 from veops/dev_ui 
删除角色相关
 2023-07-31 19:54:19 +08:00
wang-liang0615 d986bc3bbc 删除角色相关 2023-07-31 19:52:06 +08:00