Skip to content

Commit 6027666

Browse files
akhenryakhenry
authored
Merge branch 'master' into nasa#3343 
2 parents 6cde2b1 + 9920e67 commit 6027666

File tree

1,022 files changed

+4671
-2240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,022 files changed

+4671
-2240
lines changed

‎API.md

+1

‎LICENSE.md

+1-1

‎build-docs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
#*****************************************************************************
4-
#* Open MCT, Copyright (c) 2014-2020, United States Government
4+
#* Open MCT, Copyright (c) 2014-2021, United States Government
55
#* as represented by the Administrator of the National Aeronautics and Space
66
#* Administration. All rights reserved.
77
#*

‎copyright-notice.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Open MCT, Copyright (c) 2014-2020, United States Government
2+
Open MCT, Copyright (c) 2014-2021, United States Government
33
as represented by the Administrator of the National Aeronautics and Space
44
Administration. All rights reserved.
55

‎copyright-notice.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎docs/gendocs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/eventGenerator/bundle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/eventGenerator/src/EventTelemetry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/eventGenerator/src/EventTelemetryProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/export/ExportTelemetryAsCSVAction.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/export/bundle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/forms/bundle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/forms/res/templates/exampleForm.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Open MCT, Copyright (c) 2014-2020, United States Government
2+
Open MCT, Copyright (c) 2014-2021, United States Government
33
as represented by the Administrator of the National Aeronautics and Space
44
Administration. All rights reserved.
55

‎example/forms/src/ExampleFormController.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/generator/GeneratorProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/generator/SinewaveLimitProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/generator/StateGeneratorProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/generator/WorkerInterface.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/generator/generatorWorker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/generator/plugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/identity/bundle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/identity/src/ExampleIdentityService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/imagery/plugin.js

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
@@ -50,11 +50,16 @@ define([
5050
const IMAGE_DELAY = 20000;
5151

5252
function pointForTimestamp(timestamp, name) {
53+
const url = IMAGE_SAMPLES[Math.floor(timestamp / IMAGE_DELAY) % IMAGE_SAMPLES.length];
54+
const urlItems = url.split('/');
55+
const imageDownloadName = `example.imagery.${urlItems[urlItems.length - 1]}`;
56+
5357
return {
54-
name: name,
58+
name,
5559
utc: Math.floor(timestamp / IMAGE_DELAY) * IMAGE_DELAY,
5660
local: Math.floor(timestamp / IMAGE_DELAY) * IMAGE_DELAY,
57-
url: IMAGE_SAMPLES[Math.floor(timestamp / IMAGE_DELAY) % IMAGE_SAMPLES.length]
61+
url,
62+
imageDownloadName
5863
};
5964
}
6065

@@ -139,6 +144,14 @@ define([
139144
hints: {
140145
image: 1
141146
}
147+
},
148+
{
149+
name: 'Image Download Name',
150+
key: 'imageDownloadName',
151+
format: 'imageDownloadName',
152+
hints: {
153+
imageDownloadName: 1
154+
}
142155
}
143156
]
144157
};

‎example/mobile/bundle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/mobile/res/sass/mobile-example.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/msl/bundle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/msl/src/MSLDataDictionary.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/msl/src/RemsTelemetryModelProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/msl/src/RemsTelemetryProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/msl/src/RemsTelemetrySeries.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/msl/src/RemsTelemetryServerAdapter.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/notifications/bundle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/notifications/src/DialogLaunchController.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/notifications/src/DialogLaunchIndicator.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/notifications/src/NotificationLaunchController.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/notifications/src/NotificationLaunchIndicator.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/persistence/bundle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/persistence/src/BrowserPersistenceProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/policy/bundle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/policy/src/ExamplePolicy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/profiling/bundle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/profiling/src/DigestIndicator.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/profiling/src/WatchIndicator.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/scratchpad/bundle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎example/scratchpad/src/ScratchPersistenceProvider.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Open MCT, Copyright (c) 2014-2020, United States Government
2+
Open MCT, Copyright (c) 2014-2021, United States Government
33
as represented by the Administrator of the National Aeronautics and Space
44
Administration. All rights reserved.
55

‎karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎openmct.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "openmct",
3-
"version": "1.6.2-SNAPSHOT",
3+
"version": "1.7.1-SNAPSHOT",
44
"description": "The Open MCT core platform",
55
"dependencies": {},
66
"devDependencies": {

‎platform/commonUI/about/bundle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*****************************************************************************
2-
* Open MCT, Copyright (c) 2014-2020, United States Government
2+
* Open MCT, Copyright (c) 2014-2021, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*

0 commit comments

Comments
 (0)