5795 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joel McKinnon	79fe95372d	fix lint errors	2020-01-06 10:44:09 -08:00
Joel McKinnon	6adb190d0e	Merge branch 'conditionSet-view' of https://github.com/nasa/openmct into conditionSet-view-provider	2020-01-06 10:36:25 -08:00
Joel McKinnon	c094e6c6f4	change icon	2020-01-06 10:35:10 -08:00
Joel McKinnon	c08e9a89ff	add condition	2020-01-06 09:48:11 -08:00
Joshi	cc8ba18ccc	Fixes condition plugin tests	2020-01-03 11:27:06 -08:00
Joel McKinnon	57c671a42e	combined tests in one pluginSpec file	2020-01-03 09:13:17 -08:00
Joel McKinnon	1ee6ecf3ae	removed conditionSet folder and fixed lint errors	2020-01-03 08:39:13 -08:00
Joel McKinnon	5f80b3773b	restructured folders	2020-01-02 15:19:57 -08:00
Joel McKinnon	8452455050	WIP: all condition set UI elements in place - started condition form elements	2020-01-02 12:59:32 -08:00
Joel McKinnon	e5d8f60cdb	WIP: all condition set UI elements in place except condition form elements	2019-12-31 11:33:33 -08:00
Joel McKinnon	de466000a0	WIP: styling for conditionSet and condition	2019-12-30 18:26:59 -08:00
Joel McKinnon	49664c011c	component styling and expand funcitonality	2019-12-27 18:17:56 -08:00
Joel McKinnon	cf34d6b127	added domainObject bakc into provider	2019-12-27 14:23:04 -08:00
Joel McKinnon	e52f6ce099	WIP: styling components	2019-12-27 14:19:39 -08:00
Joel McKinnon	1ecdc4c487	addressed review comment	2019-12-27 13:22:05 -08:00
Joel McKinnon	d38e2c49cb	WIP: current output styling	2019-12-27 13:20:21 -08:00
Joel McKinnon	308ae2cb2e	added CurrentOutput and TestData components	2019-12-26 16:07:55 -08:00
Joel McKinnon	88219659fb	renamed Conditions component to ConditionSet	2019-12-26 13:40:58 -08:00
Joel McKinnon	c34c2df061	remove fdescribe	2019-12-26 12:36:58 -08:00
Joel McKinnon	99c7bd4c10	added conditions and condition components	2019-12-26 12:25:30 -08:00
Joel McKinnon	f93d5a6fbf	skeletal html mockup	2019-12-26 08:25:58 -08:00
Joel McKinnon	cd116667be	change to inject domainObject	2019-12-23 14:32:57 -08:00
Joel McKinnon	2f2de3952d	addressed review comments	2019-12-23 12:14:35 -08:00
Joel McKinnon	45e56798c5	removed fit	2019-12-23 11:24:25 -08:00
Joel McKinnon	0664d480e6	conditionSet provider with tests	2019-12-23 11:19:56 -08:00
Joel McKinnon	283599ddf5	Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionSet-view-provider	2019-12-20 09:56:26 -08:00
Joel McKinnon	09e3ceefa0	Merge pull request #2600 from nasa/condition-set-policy ... Adds ConditionSet composition policy. Allows conditions to be added to conditionSets	2019-12-20 08:51:37 -08:00
Joshi	87f76ebfe4	Addresses comments.	2019-12-19 21:20:38 -08:00
Joshi	55a195b841	Adds ConditionSet composition policy. Allows conditions to be added to conditionSets	2019-12-19 12:33:11 -08:00
Joel McKinnon	c7946fd7b3	refactor conditionSet pluginSpec	2019-12-19 11:14:55 -08:00
Joel McKinnon	5d3ba3199c	Merge remote-tracking branch 'origin/topic-conditionals' into conditionSet-view-provider	2019-12-19 09:07:44 -08:00
Joel McKinnon	f0d10306fc	completing merge	2019-12-19 09:06:19 -08:00
Joel McKinnon	161943b5b8	Merge pull request #2598 from nasa/condition-type ... Adds new condition type and plugin. Also adds tests	2019-12-18 15:56:20 -08:00
Shefali Joshi	e545043a26	Merge branch 'topic-conditionals' into condition-type	2019-12-18 15:52:46 -08:00
Shefali Joshi	40fb58b5b7	Merge pull request #2597 from nasa/conditionSet-object-type ... Condition set object type	2019-12-18 15:50:42 -08:00
Joshi	1f9d4708b3	Adds copyright	2019-12-18 13:19:21 -08:00
Joshi	162809e081	[#2570] adds new condition type and plugin. Also adds tests	2019-12-18 13:13:54 -08:00
Joel McKinnon	482c871ac2	removed fdescribe	2019-12-18 13:10:29 -08:00
Joel McKinnon	f0b3311630	fixed merge conflicts	2019-12-18 13:01:28 -08:00
Joel McKinnon	656d6d6c3f	addressed review comments	2019-12-18 12:48:05 -08:00
Joel McKinnon	ea45f0f4aa	WIP	2019-12-18 12:16:25 -08:00
Joel McKinnon	6a25cb0a58	renaming	2019-12-18 11:50:10 -08:00
Joel McKinnon	4a1901420d	removed fdescribe	2019-12-18 11:44:40 -08:00
Joel McKinnon	ad64f00608	WIP renaming	2019-12-18 11:43:20 -08:00
Joel McKinnon	65aea29cb9	renamed conditionCollection to conditionSet and made all filenames and references consistent	2019-12-18 11:23:37 -08:00
Joel McKinnon	7981424e9a	WIP: - preparing to rename branch	2019-12-18 11:08:21 -08:00
Joel McKinnon	10c4340475	completed tests for condition collection object	2019-12-17 13:24:34 -08:00
Joel McKinnon	0a95db1a51	fixed missing commas	2019-12-17 08:15:15 -08:00
Joel McKinnon	ace77dce65	WIP	2019-12-17 08:10:35 -08:00
Joel McKinnon	c1d58bb25f	fixed another minor merge conflict	2019-12-16 16:55:26 -08:00