499 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
pycook	9ef6d3e955	fix case sensitive of ES search	2020-02-28 14:32:51 +08:00
pycook	28888a04ee	Merge branch 'develop' of https://github.com/pycook/cmdb into develop	2020-02-23 23:13:59 +08:00
pycook	e7c004fa19	alter table c_preference_relation_views column name varchar(64)	2020-02-23 23:13:22 +08:00
pycook	93c0eefe3c	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	84fcbaefb6	version 2.1 and update readme	2020-02-23 20:21:13 +08:00
pycook	b9ef7856fe	/ redirect to /relation_views	2020-02-23 18:53:28 +08:00
pycook	c3b5b30b1f	fix i18n	2020-02-23 18:41:23 +08:00
pycook	9c47d9c733	add library future	2020-02-21 23:29:20 +08:00
pycook	c305aaaef6	Remove Chinese comments	2020-02-21 23:14:26 +08:00
pycook	2ed10069f1	lint	2020-02-21 22:46:12 +08:00
pycook	8d3756566b	The resource view is made into a two-level menu	2020-02-21 22:44:10 +08:00
penzai	91c844ba63	test: add ci and ci relation crud test cases	2020-02-18 22:05:13 +08:00
pycook	93ebc8d2e9	logo left justify	2020-02-16 19:18:51 +08:00
pycook	342a79ed0c	Merge pull request #35 from shaohaojiecoder/i18n ... I18n	2020-02-16 19:06:58 +08:00
pycook	ddc3b564fb	Merge pull request #34 from OhBonsai/develop ... add test cases	2020-02-16 19:06:24 +08:00
shaohaojiecoder	bacda2ed1e	Merge branch 'develop' into i18n	2020-02-16 18:19:09 +08:00
shaohaojiecoder	61e6f36e0c	add a log pic	2020-02-16 18:18:15 +08:00
penzai	b798d5e2cc	test: add some test cases	2020-02-16 18:03:33 +08:00
penzai	7b3f95b41d	model: allow origin and ticket_id nullable in OperationRecord	2020-02-16 18:03:08 +08:00
penzai	82c921bb88	auth: add user in flask.g when auth by jwt	2020-02-16 18:02:24 +08:00
pycook	d975aceaab	ACL i18n	2020-02-16 17:36:03 +08:00
pycook	a188218818	Merge pull request #33 from shaohaojiecoder/i18n ... fix local storage for defalut lang	2020-02-16 14:51:59 +08:00
pycook	1484a308cf	modeling i18n	2020-02-16 14:50:17 +08:00
shaohaojiecoder	ea0a7df472	fix local storage for defalut lang	2020-02-16 13:47:30 +08:00
pycook	b4de2bdb9e	Merge pull request #32 from OhBonsai/develop ... fix: recycle import by celery task	2020-02-16 10:38:27 +08:00
penzai	d2f3589154	fix: recycle import by celery task	2020-02-16 09:39:33 +08:00
pycook	07d2af6671	i18n	2020-02-15 20:57:47 +08:00
pycook	acf881dcb7	Merge pull request #31 from shaohaojiecoder/i18n ... I18n	2020-02-11 09:50:50 +08:00
pycook	cd0797e860	Merge branch 'develop' into i18n	2020-02-11 09:50:11 +08:00
shaohaojiecoder	328d678455	fix meta title	2020-02-09 19:50:23 +08:00
shaohaojiecoder	4e0dc1282f	add i18n basic structure	2020-02-09 17:54:57 +08:00
shaohaojiecoder	e336b31902	add something	2020-02-09 17:22:17 +08:00
shaohaojiecoder	f6c3edfac1	add some	2020-02-08 22:27:56 +08:00
pycook	e7f856fecd	Define display fields	2020-02-08 17:39:42 +08:00
pycook	780c51c364	Define display fields	2020-02-08 17:36:54 +08:00
shaohaojiecoder	ba142266fb	add basic	2020-02-07 22:05:52 +08:00
pycook	87deba2e46	fix jwt decode	2020-02-06 09:59:24 +08:00
pycook	048f556936	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	90a97402ef	Merge pull request #2 from pycook/master ... merge from main repo	2020-02-04 10:56:03 +08:00
penzai	362122952b	test: add ci_type test cases	2020-02-04 10:54:16 +08:00
penzai	00f4eeb90d	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	5da5d32b54	Merge branch 'master' of https://github.com/pycook/cmdb	2020-01-19 18:18:43 +08:00
pycook	d49cd99881	Merge pull request #28 from shaohaojiecoder/master ... fix drag group and attrs	2020-01-19 18:18:23 +08:00
haojie.shao	680a547df4	fix drag group and attrs	2020-01-19 18:14:53 +08:00
pycook	356cf58135	/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	28ff27c019	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	bb9d7da435	Merge remote-tracking branch 'origin/master'	2020-01-17 15:10:16 +08:00
penzai	1fa9bf8880	test: add basic test code and attribute create api test case	2020-01-17 15:08:46 +08:00
Bonsai	75bf42ea3c	Merge pull request #1 from pycook/master ... merge master	2020-01-17 10:05:05 +08:00
pycook	5931e9879b	[fix] cycle import	2020-01-15 11:52:33 +08:00