7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-11-04 21:56:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
712 Commits 14 Branches 41 Tags
e6eb1b82470be441446328df7b26afd1961e1024
Commit Graph

237 Commits

Author SHA1 Message Date
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
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
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
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
6843eb57c4 [update] delete roles, users, attributes 2023-08-15 19:47:59 +08:00
hu.sima
dc6da9ba2a fix: default arg value 2023-08-10 19:05:56 +08:00
hu.sima
4cecdb10fb fix: remove useless 2023-08-10 18:55:32 +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
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
7e38dd8fab upgrade celery 2023-08-08 13:16:07 +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
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
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
0263842b70 fix delete ci_type 2023-07-31 18:39:33 +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
5d299bd71a add command cmdb-index-table-upgrade 2023-07-25 10:31:30 +08:00
pycook
c196c75985 废弃3个表: c_value_datetime c_value_floats c_value_integers, time类型属性值增加写入校验 2023-07-24 21:55:00 +08:00
pycook
7443f96813 禁止删除唯一标识的属性 2023-07-21 15:58:41 +08:00
songbing01249
49d612d8db fix(ci_type_group_manager): fix resources issues 2023-07-20 11:01:25 +08:00
pycook
abc83db77b PyJWT==2.4.0 2023-07-13 17:07:33 +08:00
lovvvve
c6e150a3df Update click_cmdb.py 
add-user remove --is_admin
 2023-07-13 15:49:35 +08:00
lovvvve
7c83f9dca7 Update click_cmdb.py 
add-user  remove --is_admin
 2023-07-13 15:18:47 +08:00
pycook
1861d24593 update requirements 2023-07-12 15:32:46 +08:00
pycook
4495f006c0 docker-compose is ok 2023-07-11 18:22:17 +08:00
pycook
6c56757a9d docker-compose is ok 2023-07-11 18:12:22 +08:00
pycook
109d4f1a2e 前后端全面升级 2023-07-10 20:13:39 +08:00
pycook
db5ff60aff 前后端全面升级 2023-07-10 20:07:20 +08:00
lovvvve
98c7f97274 fix: 🐛 db search 
Escape ":" character in SQLAlchemy
 2021-11-10 18:56:42 +08:00
x-7
7936b9cb09 Update ci.py 
cmdb-api:add attr check in ci_manager update method
 2021-04-21 19:17:05 +08:00
lovvvve
3c6cc7f91b Update value.py 
value type 是 int 或 float 时 value 值等于 0 是会删除 的 BUG
 2021-01-28 16:57:20 +08:00
lovvvve
8a5dadcaa4 Update ci.py 
兼容 py2
 2021-01-28 16:56:04 +08:00
lovvvve
08fcac6a12 Update value.py 2021-01-28 16:46:19 +08:00
lovvvve
103596238e Update value.py 
feat(AttributeValueManager.create_or_update_attr_value()): AttributeValue update skip The same value
 2021-01-28 16:32:53 +08:00
lovvvve
889d9155bc Update value.py 
feat(AttributeValueManager.create_or_update_attr_value()): AttributeValue update skip The same value
 2021-01-28 16:30:17 +08:00