7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-10-31 19:39:24 +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
e576d41497 Merge pull request #148 from simontigers/common_setting_format 
fix: default arg value
 2023-08-10 19:31:18 +08:00
pycook
4c33d6dee9 Merge pull request #149 from veops/dev_ui 
ui更新：password
 2023-08-10 19:28:24 +08:00
EvanSung
74de3ec0b3 refactor(fe): reduce the width of resource mgt table 2023-08-10 19:23:41 +08:00
wang-liang0615
5e5ae296e0 Merge branch 'master' of github.com:veops/cmdb into dev_ui 2023-08-10 19:21:28 +08:00
wang-liang0615
e81606aa81 增加密码明文传输 2023-08-10 19:21:10 +08:00
hu.sima
dc6da9ba2a fix: default arg value 2023-08-10 19:05:56 +08:00
pycook
d40e69aa30 Merge pull request #147 from simontigers/common_setting_format 
fix: remove useless
 2023-08-10 19:01:25 +08:00
hu.sima
4cecdb10fb fix: remove useless 2023-08-10 18:55:32 +08:00
pycook
ddf02213db Merge pull request #146 from simontigers/common_setting_format 
Common setting format
 2023-08-10 18:23:24 +08:00
hu.sima
28dea81036 fix: remove unused column 2023-08-10 16:29:52 +08:00
hu.sima
9756f70044 style: format common setting 2023-08-10 15:30:01 +08:00
pycook
88cea199c1 Merge pull request #145 from EvanSung/optimize_20230810_auth_require 
optimize(auth): auth request json
 2023-08-10 11:24:23 +08:00
EvanSung
684c1ab924 optimize(auth): auth request json 2023-08-10 10:43:59 +08:00
pycook
cb01b577a5 fix celery config 2023-08-08 16:33:24 +08:00
pycook
694abf78b3 Merge branch 'master' of github.com:veops/cmdb 2023-08-08 13:16:14 +08:00
pycook
7e38dd8fab upgrade celery 2023-08-08 13:16:07 +08:00
pycook
7afefe1070 Merge pull request #144 from veops/dev_ui 
UI更新：fix preferenceList=>attrList
 2023-08-08 09:21:10 +08:00
wang-liang0615
31a4cb62d8 Merge branch 'master' of github.com:veops/cmdb into dev_ui 2023-08-08 09:11:24 +08:00
wang-liang0615
79a2fd32c1 fix preferenceList=>attrList 2023-08-08 09:11:03 +08:00
pycook
ef09497d67 upgrade flask to 2.3.2 and replace g.user with current_user 2023-08-06 21:54:18 +08:00
pycook
51c6d50b38 Merge pull request #138 from lovvvve/fix_ldap 
fix ldap login
 2023-08-04 11:31:58 +08:00
pycook
edb74d5790 Merge pull request #142 from veops/dev_ui 
ci 批量更新和删除的异步处理
 2023-08-04 09:27:55 +08:00
wang-liang0615
9b7d6d8f12 Merge branch 'master' of github.com:veops/cmdb into dev_ui 2023-08-03 16:54:47 +08:00
wang-liang0615
61e178530f ci 批量更新和删除的异步处理 2023-08-03 16:54:27 +08:00
pycook
3632f5f4a6 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
cd11b002ee fix(trigger): session invalid issue 2023-08-02 18:22:42 +08:00
lovvvve
883d7776e1 fix ldap login 2023-08-01 11:27:29 +00:00
pycook
695e9f7546 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
c3cbdc606f Merge pull request #135 from simontigers/remove_pandas 
fix: remove pandas
 2023-08-01 15:55:15 +08:00
hu.sima
5cb5650cde fix: remove pandas 2023-08-01 15:32:44 +08:00
dependabot[bot]
8d95092b52 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
458b1d144b Merge branch 'master' of github.com:veops/cmdb 2023-08-01 13:47:34 +08:00
pycook
ec0f3d5a9f fix dependabot alerts 2023-08-01 13:47:11 +08:00
pycook
8c21df189f fix dependabot alerts 2023-08-01 13:46:47 +08:00
pycook
a882a62d1c 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
d7d2e127d3 Merge pull request #132 from veops/dev_ui 
删除角色相关
 2023-07-31 19:54:19 +08:00
wang-liang0615
82f4bb5b65 删除角色相关 2023-07-31 19:52:06 +08:00
pycook
96ba04dc31 Merge branch 'master' of github.com:veops/cmdb 2023-07-31 18:39:46 +08:00
pycook
0263842b70 fix delete ci_type 2023-07-31 18:39:33 +08:00
pycook
c0443a4e3f Merge pull request #131 from veops/dev_ui 
前端acl
 2023-07-28 18:03:36 +08:00
wang-liang0615
10b7f9dfcb common-setting 2023-07-27 15:47:13 +08:00
wang-liang0615
c2cca38f1c acl 2023-07-27 15:30:27 +08:00
wang-liang0615
742cd4ead1 fix acl change page size 2023-07-27 15:08:25 +08:00
dependabot[bot]
5e0ea75fae 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
7715d52e33 Merge pull request #129 from veops/dev_ui 
前端更新
 2023-07-25 18:19:47 +08:00
wang-liang0615
bd72abba10 Merge branch 'master' of github.com:veops/cmdb into dev_ui 2023-07-25 13:11:03 +08:00
wang-liang0615
8dc437bc81 授权高亮提示 2023-07-25 13:10:45 +08:00
pycook
5d299bd71a add command cmdb-index-table-upgrade 2023-07-25 10:31:30 +08:00
wang-liang0615
3d3453e257 style 新建属性行错乱 2023-07-25 10:18:22 +08:00
pycook
c196c75985 废弃3个表: c_value_datetime c_value_floats c_value_integers, time类型属性值增加写入校验 2023-07-24 21:55:00 +08:00