Commit Graph

367 Commits

Author SHA1 Message Date
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
pycook 044b820548 Merge branch 'master' of github.com:veops/cmdb 2023-07-31 18:39:46 +08:00
pycook 536daa6d4f fix delete ci_type 2023-07-31 18:39:33 +08:00
pycook b0620b043b
Merge pull request #131 from veops/dev_ui
前端acl
2023-07-28 18:03:36 +08:00
wang-liang0615 a88c9cf7f7 common-setting 2023-07-27 15:47:13 +08:00
wang-liang0615 be50f505d1 acl 2023-07-27 15:30:27 +08:00
wang-liang0615 0bb4f633d6 fix acl change page size 2023-07-27 15:08:25 +08:00
dependabot[bot] 78b521f3af
Bump certifi from 2023.5.7 to 2023.7.22 in /cmdb-api
Bumps [certifi](https://github.com/certifi/python-certifi) from 2023.5.7 to 2023.7.22.
- [Commits](https://github.com/certifi/python-certifi/compare/2023.05.07...2023.07.22)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-25 23:35:30 +00:00
pycook 77bc850d4a
Merge pull request #129 from veops/dev_ui
前端更新
2023-07-25 18:19:47 +08:00
wang-liang0615 e52f201ba1 Merge branch 'master' of github.com:veops/cmdb into dev_ui 2023-07-25 13:11:03 +08:00
wang-liang0615 64aea424dc 授权高亮提示 2023-07-25 13:10:45 +08:00
pycook 0655b0e9eb add command cmdb-index-table-upgrade 2023-07-25 10:31:30 +08:00
wang-liang0615 cce0649299 style 新建属性行错乱 2023-07-25 10:18:22 +08:00
pycook 52574c64cc 废弃3个表: c_value_datetime c_value_floats c_value_integers, time类型属性值增加写入校验 2023-07-24 21:55:00 +08:00
pycook fb904b01a6 禁止删除唯一标识的属性 2023-07-21 15:58:41 +08:00
pycook 63af79ec45 Merge branch 'master' of github.com:veops/cmdb 2023-07-20 18:37:14 +08:00
pycook 38af86317a fix docker-compose 2023-07-20 18:36:32 +08:00
pycook 03bac86588
Merge pull request #127 from veops/dev_ui
fix currentValueType
2023-07-20 15:39:11 +08:00
wang-liang0615 130b68cadd fix currentValueType 2023-07-20 15:30:12 +08:00
pycook 65000f8141 更新架构图 2023-07-20 11:01:25 +08:00
pycook 23692ad50b update readme 2023-07-20 11:01:25 +08:00
pycook 16cd34e8b8 update readme 2023-07-20 11:01:25 +08:00
pycook 985f67ee47 lint 2023-07-20 11:01:25 +08:00
wang-liang0615 8d95f8d57d 角色授权 2023-07-20 11:01:25 +08:00
pycook cf6230008d 清理空间 2023-07-20 11:01:25 +08:00
songbing01249 ec97fa84d8 fix(ci_type_group_manager): fix resources issues 2023-07-20 11:01:25 +08:00
pycook 76f074704b update cmdb_api.md 2023-07-20 10:56:58 +08:00
wang-liang0615 e5addab3af 删除fullscreen相关代码 2023-07-19 17:46:27 +08:00
wang-liang0615 1c6be9e281 format 2023-07-19 15:36:46 +08:00
wang-liang0615 9552892c68 ops table getVxetableRef 2023-07-19 14:39:57 +08:00
wang-liang0615 b59e1af318 编译 acl 2023-07-19 13:52:24 +08:00