ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-24 07:16:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,409 Commits 989 Branches 212 Tags 191 MiB
d462db60de
Commit Graph

6409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshi
666459be87 Merge branch 'master' of https://github.com/nasa/openmct into fix-telemetryview-styles 2020-04-02 10:30:07 -07:00
Shefali Joshi
53df89aa5d
Merge branch 'master' into criterion-delete 2020-04-02 10:26:57 -07:00
Shefali Joshi
8f553f6327
Merge pull request #2848 from nasa/fix-any-telemetry 
Fix LAD requests for any/all telemetry
 2020-04-02 10:23:26 -07:00
Joshi
f91a64483b Adds missing id during create condition 2020-04-02 10:18:41 -07:00
Joshi
de8d63c09d Merge branch 'master' of https://github.com/nasa/openmct into criterion-delete 2020-04-02 10:11:42 -07:00
Shefali Joshi
58b4a6ebf5
Merge branch 'master' into fix-any-telemetry 2020-04-02 10:06:37 -07:00
Shefali Joshi
9d45080526
Merge pull request #2858 from nasa/dave/conditionals-request-default 
request LAD for default condition
 2020-04-02 10:05:42 -07:00
Joshi
d3fe2a6811 Merge branch 'master' of https://github.com/nasa/openmct into fix-telemetryview-styles 2020-04-01 15:52:55 -07:00
Joshi
97b37edce4 Store telemetry styles on their container domain objects. 2020-04-01 15:51:40 -07:00
Joel McKinnon
d3443518d6 reverted changes unrelated to id 2020-04-01 15:08:31 -07:00
Joel McKinnon
c33314a4bf added uuid to addCriteria, cloneCriteria, changed key of v-for to criteria.id 2020-04-01 14:56:32 -07:00
David Tsay
59eb034ab4
Merge branch 'master' into dave/conditionals-request-default 2020-04-01 14:42:21 -07:00
Nikhil
67d53fb62b
[Notebook]: When notebook is not default new entry button does not add new entry #2841 (#2855) 
Co-authored-by: Deep Tailor <deep.j.tailor@nasa.gov>
 2020-04-01 14:28:52 -07:00
Nikhil
0fd637c0e9
[Notebook]: Error in nextTick: "TypeError: Cannot read property 'focus' of null" #2845 (#2857) 2020-04-01 14:22:11 -07:00
Joel McKinnon
169cc6617a added uuid() in conditionManager 2020-04-01 13:58:58 -07:00
David Tsay
a946325e95 request LAD for default condition 2020-04-01 13:58:27 -07:00
Joel McKinnon
1beba78111 removed call to checkTelemetry in computed prop, removed if in persist(), changed key in v-for for criteria 2020-04-01 13:34:17 -07:00
Joel McKinnon
2edfeaa606 added checkTelemetry call in inputCount computed prop 2020-04-01 12:15:02 -07:00
Joel McKinnon
2a1f9fd063 removed recursive call 2020-04-01 11:10:10 -07:00
Joel McKinnon
63fe92f8ea Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into criterion-delete 2020-04-01 10:37:01 -07:00
Joel McKinnon
35f303ffa4 changed inputCount to computed property 2020-04-01 10:35:49 -07:00
Joshi
dd70bb470f Merge branch 'master' of https://github.com/nasa/openmct into fix-telemetryview-styles 2020-04-01 10:18:30 -07:00
Nikhil
250fee125a
Merge pull request #2854 from nasa/notebook-preview-action-fix 
[Notebook] Embed preview action fix
 2020-04-01 10:13:01 -07:00
Joshi
956029c786 Merge branch 'fix-any-telemetry' of https://github.com/nasa/openmct into fix-any-telemetry 2020-04-01 10:11:30 -07:00
Joshi
b9ab599c35 Fix description and errors for all/any telemetry 2020-04-01 10:10:31 -07:00
Deep Tailor
5a690932e9 Merge branch 'master' of https://github.com/nasa/openmct into notebook-preview-action-fix 2020-04-01 09:59:57 -07:00
Deep Tailor
b00757150e use objectPathJSON 2020-04-01 09:58:30 -07:00
Joshi
8515a411bd Merge branch 'master' of https://github.com/nasa/openmct into fix-any-telemetry 2020-04-01 09:55:55 -07:00
Shefali Joshi
3034ec016a
Merge branch 'master' into fix-any-telemetry 2020-04-01 09:55:03 -07:00
David Tsay
a81af1ce34
check format first (#2851) 
default to number
 2020-03-31 21:04:52 -07:00
Deep Tailor
64c5725687 pass correct object path, and remove notebook snapshot button from preview 2020-03-31 20:59:20 -07:00
Joshi
72a3248123 Fix LAD requests for any/all telemetry 2020-03-31 16:48:59 -07:00
Shefali Joshi
ee4a81bdfd
Conditionals feature (#2830) 
Introduces conditional styling feature.
 2020-03-31 15:56:06 -07:00
Joshi
b90eb80584 Addresses review comments: Rename file, change copyright year, remove commented out code 2020-03-31 15:50:30 -07:00
Charles Hacskaylo
ebaf702c59
Topic conditionals master merge (#2833) 
- Restore updated symbols font file for Condition Widget icon glyph;
- Change "All telemetry | Any telemetry" to all lowercase;
- Fix cursor styles for Condition Widget;
- Fix Safari layout problems with Condition Set/section styles;
 2020-03-31 15:36:50 -07:00
Shefali Joshi
3956cd1c06
Merge pull request #2829 from nasa/topic-conditionals-master-merge 
Topic conditionals master merge
 2020-03-31 14:25:16 -07:00
Joshi
064cf6747e Adds copyright text 2020-03-31 14:21:30 -07:00
Joshi
8512b634c7 Merge branch 'master' of https://github.com/nasa/openmct into topic-conditionals 2020-03-31 12:54:12 -07:00
David Tsay
4220a8a68a
[Conditionals] default condition handling (#2827) 
* Sisplay default condition output by... default
 2020-03-31 12:32:06 -07:00
Nikhil
e7e5116773
[Notebook] V2.0 development #2666 (#2755) 
* Notebook v2.0
Co-authored-by: charlesh88 <charlesh88@gmail.com>
 2020-03-31 12:11:11 -07:00
David Tsay
079201273e Merge branch 'master' into topic-conditionals 2020-03-31 12:02:37 -07:00
Shefali Joshi
e4c9f156a7
Merge pull request #2800 from nasa/any-all-telemetry 
Any all telemetry option for conditions.
 2020-03-31 11:49:23 -07:00
Joshi
42eeeea374 Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into any-all-telemetry 2020-03-31 11:00:00 -07:00
Charles Hacskaylo
7b060509f5
c-object-label changes brought over from topic-conditionals (#2823) 
- SCSS mods;
- Markup in select objects
 2020-03-30 17:30:53 -07:00
Deep Tailor
3ca9e9ae56
When view params change, get a new copy of the domainObject (#2813) 
Update browseObject on object change
 2020-03-30 17:27:10 -07:00
Joel McKinnon
984bede43b
Removed image properties button from display layouts toolbar (#2809) 
Removed image properties button from display layouts toolbar
 2020-03-30 16:58:46 -07:00
Deep Tailor
87d838c690
[Tables] Use parsed data to sort (#2785) 
* Use parsed values when sorting
 2020-03-30 16:57:20 -07:00
Joshi
072bf361de Store styles for telemetry on domain objects 2020-03-30 16:20:22 -07:00
Shefali Joshi
4e39d9fb84
Test data for condition sets (#2807) 
* Test Data
* Persist testData and apply it to the conditionSet
* Do not persist the applied flag, but persist test data
Co-authored-by: charlesh88 <charlesh88@gmail.com>
 2020-03-30 15:45:07 -07:00
Joshi
14eaf4e899 Addresses comments: Fixes dropdown logic 2020-03-30 12:17:49 -07:00