270 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
pycook	e709b90cf3	Merge branch 'develop' of https://github.com/pycook/cmdb into develop	2020-02-23 23:13:59 +08:00
pycook	658e6236ac	alter table c_preference_relation_views column name varchar(64)	2020-02-23 23:13:22 +08:00
pycook	f0d18c2fc3	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	94cf6139c1	version 2.1 and update readme	2020-02-23 20:21:13 +08:00
pycook	08da6be938	/ redirect to /relation_views	2020-02-23 18:53:28 +08:00
pycook	0b08d85472	fix i18n	2020-02-23 18:41:23 +08:00
pycook	2209d06d69	add library future	2020-02-21 23:29:20 +08:00
pycook	f778fed5dc	Remove Chinese comments	2020-02-21 23:14:26 +08:00
pycook	27ba67b27c	lint	2020-02-21 22:46:12 +08:00
pycook	db13a5b8b1	The resource view is made into a two-level menu	2020-02-21 22:44:10 +08:00
penzai	9cfa00a8f2	test: add ci and ci relation crud test cases	2020-02-18 22:05:13 +08:00
pycook	9cb60060f8	logo left justify	2020-02-16 19:18:51 +08:00
pycook	17616fafbd	Merge pull request #35 from shaohaojiecoder/i18n ... I18n	2020-02-16 19:06:58 +08:00
pycook	2823249a07	Merge pull request #34 from OhBonsai/develop ... add test cases	2020-02-16 19:06:24 +08:00
shaohaojiecoder	7624b45480	Merge branch 'develop' into i18n	2020-02-16 18:19:09 +08:00
shaohaojiecoder	1acc3b3f42	add a log pic	2020-02-16 18:18:15 +08:00
penzai	c9f7a8122f	test: add some test cases	2020-02-16 18:03:33 +08:00
penzai	a1e510d812	model: allow origin and ticket_id nullable in OperationRecord	2020-02-16 18:03:08 +08:00
penzai	f40d6924aa	auth: add user in flask.g when auth by jwt	2020-02-16 18:02:24 +08:00
pycook	00f1035cd2	ACL i18n	2020-02-16 17:36:03 +08:00
pycook	616c1df0b4	Merge pull request #33 from shaohaojiecoder/i18n ... fix local storage for defalut lang	2020-02-16 14:51:59 +08:00
pycook	69d43806f5	modeling i18n	2020-02-16 14:50:17 +08:00
shaohaojiecoder	084d2e2993	fix local storage for defalut lang	2020-02-16 13:47:30 +08:00
pycook	c6fd02b07c	Merge pull request #32 from OhBonsai/develop ... fix: recycle import by celery task	2020-02-16 10:38:27 +08:00
penzai	da0d2595cd	fix: recycle import by celery task	2020-02-16 09:39:33 +08:00
pycook	0875a0c644	i18n	2020-02-15 20:57:47 +08:00
pycook	7f9d990381	Merge pull request #31 from shaohaojiecoder/i18n ... I18n	2020-02-11 09:50:50 +08:00
pycook	ba99e5758c	Merge branch 'develop' into i18n	2020-02-11 09:50:11 +08:00
shaohaojiecoder	af96a724b5	fix meta title	2020-02-09 19:50:23 +08:00
shaohaojiecoder	43a1149055	add i18n basic structure	2020-02-09 17:54:57 +08:00
shaohaojiecoder	1434b0a0dc	add something	2020-02-09 17:22:17 +08:00
shaohaojiecoder	f1d14d6c68	add some	2020-02-08 22:27:56 +08:00
pycook	b043a27b1b	Define display fields	2020-02-08 17:39:42 +08:00
pycook	12345f8963	Define display fields	2020-02-08 17:36:54 +08:00
shaohaojiecoder	e79f5e008c	add basic	2020-02-07 22:05:52 +08:00
pycook	aa10b0d8b4	update cmdb.sql	2020-02-06 13:41:16 +08:00
pycook	f86a0b49d5	fix jwt decode	2020-02-06 09:59:24 +08:00
pycook	39d13d1993	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	0d23731bd4	Merge pull request #2 from pycook/master ... merge from main repo	2020-02-04 10:56:03 +08:00
penzai	32cb3f82db	test: add ci_type test cases	2020-02-04 10:54:16 +08:00
penzai	1883047e3c	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	717ef3255e	Merge branch 'master' of https://github.com/pycook/cmdb	2020-01-19 18:18:43 +08:00
pycook	aa38f41d8c	Merge pull request #28 from shaohaojiecoder/master ... fix drag group and attrs	2020-01-19 18:18:23 +08:00
haojie.shao	901e3f7a9f	fix drag group and attrs	2020-01-19 18:14:53 +08:00
pycook	bf43d7c069	/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	691053a40e	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	6d04da776f	Merge remote-tracking branch 'origin/master'	2020-01-17 15:10:16 +08:00
penzai	35590141f6	test: add basic test code and attribute create api test case	2020-01-17 15:08:46 +08:00
Bonsai	d65b9a0816	Merge pull request #1 from pycook/master ... merge master	2020-01-17 10:05:05 +08:00
pycook	cbfca6f046	[fix] cycle import	2020-01-15 11:52:33 +08:00