487 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
pycook	1ba3f85f7e	fix g.user	2023-08-21 11:54:33 +08:00
pycook	3071983d6b	version: 2.3.1	2023-08-20 11:24:53 +08:00
pycook	836892d909	lint	2023-08-20 11:23:55 +08:00
pycook	a24ba8f7cd	Merge pull request #157 from EvanSung/fix_20230817_guser_issue ... fix(acl): g user issue	2023-08-17 22:12:45 +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	2200b122f0	Merge pull request #155 from veops/dev_ui ... 前端更新	2023-08-16 13:01:13 +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
wang-liang0615	5c25433e03	Merge branch 'master' of github.com:veops/cmdb into dev_ui	2023-08-16 10:09:47 +08:00
wang-liang0615	f8e94b7c70	delete user	2023-08-16 10:09:25 +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	76a41a8e82	Merge branch 'master' of github.com:veops/cmdb	2023-08-15 19:48:11 +08:00
pycook	6843eb57c4	[update] delete roles, users, attributes	2023-08-15 19:47:59 +08:00
wang-liang0615	20caae8263	Merge pull request #152 from veops/dev_ui ... 前端更新	2023-08-15 19:47:03 +08:00
wang-liang0615	5e61da038f	属性库	2023-08-15 19:34:17 +08:00
wang-liang0615	348a34d862	属性库	2023-08-15 19:26:49 +08:00
wang-liang0615	2471af867a	属性库	2023-08-15 19:21:09 +08:00
wang-liang0615	775f65ba7b	属性库	2023-08-15 19:10:26 +08:00
wang-liang0615	ebd0b1dc2e	后台管理-模型关联 关系删除&&筛选	2023-08-15 15:02:46 +08:00
pycook	14b5119d94	update gitattributes	2023-08-15 13:41:45 +08:00
wang-liang0615	45167225c9	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	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