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
Joel McKinnon
fbcafe0f62
mfixed merge conflicts
2019-12-16 16:50:57 -08:00
Joel McKinnon
9a9d9222a9
Merge branch 'master' into condition-object-type
2019-12-16 14:52:48 -08:00
Joel McKinnon
221e5b4f6c
Added tests for ConditionPlugin
2019-12-16 14:42:19 -08:00
Joshi
5df74aee68
[test-framework] Adds basic test for condition plugin
2019-12-16 11:06:19 -08:00
Nikhil
3b195e9c7d
Example imagery vue ( #2525 )
...
* WIP: imagery vue refactor
* cleaup
* show orange border when paused.
* resize image and thumbs wrappers.
* scrollToBottom fixed.
* fixed lint errors
* use multipane vue component for resize + cleanup + style adjustments.
* added min-height to image pane and thumbs-layout pane.
* remove old plugin and using es6 const.
* using ES6 imports.
* clean up + formatting changes.
* updated as per review comments.
* extracted styles from vue component.
* fixed lint errors.
* updated as per review comments + cleanup.
2019-12-13 15:36:01 -08:00
Joel McKinnon
17838d8040
WIP: setting up test framework for conditionals
2019-12-12 14:36:24 -08:00
Andrew Henry
2248c2da08
Removed styleguide
2019-12-11 16:21:51 -08:00
Andrew Henry
532c0e98db
Merges TCR with master
2019-12-11 16:09:15 -08:00
Andrew Henry
ef3bae1312
Merge branch 'topic-core-refactor' into tcr-master
2019-12-11 15:56:24 -08:00
Nikhil
37a8cf071c
https://github.com/nasa/openmct/issues/2577 ( #2580 )
...
* https://github.com/nasa/openmct/issues/2577
* Remove notebook.scss import. Move to vue-styles.scss
2019-12-11 15:56:00 -08:00
Andrew Henry
98c9cc92b8
Merge branch 'topic-core-refactor' into tcr-master
2019-12-11 14:52:11 -08:00
Deep Tailor
490cb2225d
Move check for linestyle to plotseries fetch function ( #2561 )
2019-12-11 14:49:12 -08:00
Andrew Henry
ecd8372efa
Fixed merged conflict
2019-12-11 14:40:53 -08:00
Nikhil
50173a4413
Theming ( #2567 )
...
* Separate Vue component styles out from SFCs.
* Added 'MCT.prototype.getAssetPath' and using 'openmct.setAssetPath' to get relative path for assets.
* Re-implements `openmct.plugins.Snow()`, and `openmct.plugins.Espresso()` (as well as a new theme `openmct.plugins.Maelstron()`)
2019-12-11 14:27:13 -08:00
Andrew Henry
76fc0b01fa
Updated version number ( #2574 )
2019-12-11 14:22:51 -08:00
Andrew Henry
23781fa686
Correct release number ( #2575 )
2019-12-11 14:16:24 -08:00
Andrew Henry
8ec1b9965a
Updates to README in topic-core-refactor ( #2573 )
...
* Updates to README in topic-core-refactor
In preparation for merge into Master
* Added section on v1.0.0 and link to Migration Guide
* Minor wording change
* More minor wording changes
2019-12-11 10:28:47 -08:00
Charles Hacskaylo
a16a44208a
Fixes Notebook and Inspector layout issues ( #2568 )
...
* Fix linting-related issues
* Fix Notebook overlay display issues
2019-12-10 16:44:54 -08:00
Joel McKinnon
f82ca91a61
changed node mules path
2019-12-06 15:13:03 -08:00
