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

373 Commits

Author SHA1 Message Date
pycook 21d8673b5d Merge pull request #38 from AngrygrayWolf/dev 
Change the requirements to support python3.8
 2020-03-07 22:06:25 +08:00
what 7154426dc7 Change Pipfile 2020-03-07 21:51:37 +08:00
what ca75c7dcd0 Change the requirements to support python3.8 2020-03-07 21:20:46 +08:00
pycook 194a2254a6 fix case sensitive of ES search 2020-02-28 14:32:51 +08:00
pycook 26abad14d0 Merge branch 'develop' of https://github.com/pycook/cmdb into develop 2020-02-23 23:13:59 +08:00
pycook 1521a71f9c alter table c_preference_relation_views column name varchar(64) 2020-02-23 23:13:22 +08:00
pycook d425b455f1 Merge pull request #36 from OhBonsai/develop 
test: add ci and ci relation crud test cases
 2020-02-23 23:12:36 +08:00
pycook 230307474b version 2.1 and update readme 2020-02-23 20:21:13 +08:00
pycook 69d6b40e39 / redirect to /relation_views 2020-02-23 18:53:28 +08:00
pycook 5dc2f89e7f fix i18n 2020-02-23 18:41:23 +08:00
pycook 9eaca4d6a0 add library future 2020-02-21 23:29:20 +08:00
pycook 3680a462f5 Remove Chinese comments 2020-02-21 23:14:26 +08:00
pycook 3ac50e7cd8 lint 2020-02-21 22:46:12 +08:00
pycook 21b2cc1d5d The resource view is made into a two-level menu 2020-02-21 22:44:10 +08:00
penzai cd5448cc7d test: add ci and ci relation crud test cases 2020-02-18 22:05:13 +08:00
pycook 10610bdb4b logo left justify 2020-02-16 19:18:51 +08:00
pycook b5c2156387 Merge pull request #35 from shaohaojiecoder/i18n 
I18n
 2020-02-16 19:06:58 +08:00
pycook b05ae0d1a7 Merge pull request #34 from OhBonsai/develop 
add test cases
 2020-02-16 19:06:24 +08:00
shaohaojiecoder bbf6138d43 Merge branch 'develop' into i18n 2020-02-16 18:19:09 +08:00
shaohaojiecoder 1ba3e6a680 add a log pic 2020-02-16 18:18:15 +08:00
penzai 64045c1f93 test: add some test cases 2020-02-16 18:03:33 +08:00
penzai 5a3e55813c model: allow origin and ticket_id nullable in OperationRecord 2020-02-16 18:03:08 +08:00
penzai bc72e58886 auth: add user in flask.g when auth by jwt 2020-02-16 18:02:24 +08:00
pycook 9e78955ba1 ACL i18n 2020-02-16 17:36:03 +08:00
pycook 136853d9a4 Merge pull request #33 from shaohaojiecoder/i18n 
fix local storage for defalut lang
 2020-02-16 14:51:59 +08:00
pycook 036e3ad00d modeling i18n 2020-02-16 14:50:17 +08:00
shaohaojiecoder 5ce6c93237 fix local storage for defalut lang 2020-02-16 13:47:30 +08:00
pycook 43dba7f7ed Merge pull request #32 from OhBonsai/develop 
fix: recycle import by celery task
 2020-02-16 10:38:27 +08:00
penzai f4879d20d6 fix: recycle import by celery task 2020-02-16 09:39:33 +08:00
pycook 740e4c6034 i18n 2020-02-15 20:57:47 +08:00
pycook 0f2baa1d94 Merge pull request #31 from shaohaojiecoder/i18n 
I18n
 2020-02-11 09:50:50 +08:00
pycook 405b0af72c Merge branch 'develop' into i18n 2020-02-11 09:50:11 +08:00
shaohaojiecoder a4e5178979 fix meta title 2020-02-09 19:50:23 +08:00
shaohaojiecoder c14fe23283 add i18n basic structure 2020-02-09 17:54:57 +08:00
shaohaojiecoder b3a058f908 add something 2020-02-09 17:22:17 +08:00
shaohaojiecoder bd82a0e27c add some 2020-02-08 22:27:56 +08:00
pycook f22a5c3543 Define display fields 2020-02-08 17:39:42 +08:00
pycook ed81c3f091 Define display fields 2020-02-08 17:36:54 +08:00
shaohaojiecoder 07814b85f9 add basic 2020-02-07 22:05:52 +08:00
pycook db52b28d6b fix jwt decode 2020-02-06 09:59:24 +08:00
pycook fc85ba21c8 Merge pull request #29 from OhBonsai/master 
fix ci_type_attr_group update bug and add ci_type test case
 2020-02-04 12:47:15 +08:00
Bonsai 6c5ee3fcd9 Merge pull request #2 from pycook/master 
merge from main repo
 2020-02-04 10:56:03 +08:00
penzai 40f1ef88a9 test: add ci_type test cases 2020-02-04 10:54:16 +08:00
penzai bce422ffc8 fix: update attribute group without name params will fail. #tests/test_cmdb_ci_type.py::test_update_attribute_group_ci_type 2020-02-04 10:53:07 +08:00
pycook 7c79066532 Merge branch 'master' of https://github.com/pycook/cmdb 2020-01-19 18:18:43 +08:00
pycook 1129ac93fb Merge pull request #28 from shaohaojiecoder/master 
fix drag group and attrs
 2020-01-19 18:18:23 +08:00
haojie.shao 5ab0e7e737 fix drag group and attrs 2020-01-19 18:14:53 +08:00
pycook 23319c7417 /ci_types/<int:type_id>/attributes/transfer and /ci_types/<int:type_id>/attribute_groups/transfer 2020-01-19 17:59:32 +08:00
pycook c74f85cabb Merge pull request #26 from OhBonsai/master 
test: add basic test code and attribute create api test case
 2020-01-17 15:34:02 +08:00
penzai fce2b689fb Merge remote-tracking branch 'origin/master' 2020-01-17 15:10:16 +08:00