ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-23 23:12:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,325 Commits 989 Branches 212 Tags 191 MiB
cdcaedc8dd
Commit Graph

1325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Hacskaylo
03252aac1b [Frontend] Ported over all /platform changes from warp1222 
WTD-1222
 2015-06-08 13:50:54 -07:00
Charles Hacskaylo
b18159b8e1 Merging in latest from ue-frontend 2015-06-08 13:45:31 -07:00
Victor Woeltjen
4ab36bd421 [Limits] Show limits from scrolling list view 
WTD-1223.
 2015-06-08 11:57:05 -07:00
Pete Richards
31e0e0adc7 Merge pull request #3 from nasa/open-1201 
[Integration] Window Titling
 2015-06-08 11:27:42 -07:00
larkin
689701b37f [Licenses] Add License Header 2015-06-08 11:23:25 -07:00
Charles Hacskaylo
9f90c6b8d8 [Frontend] Updated CSS; removed position: relative 
WTD-884
 2015-06-08 11:14:58 -07:00
larkin
eb1621dad9 Merge branch 'open1200' into open-1201 2015-06-08 11:11:50 -07:00
Victor Woeltjen
f4adc6a889 Merge branch 'open-master' into open1223 
Merge in latest from master branch into topic branch for
limits, WTD-1223.

Conflicts:
	platform/commonUI/general/res/css/forms.css
	platform/commonUI/general/res/css/plots.css
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/css/tree.css
	platform/commonUI/general/res/sass/_fixed-position.scss
	platform/commonUI/general/res/sass/plots/_plots-main.scss
	platform/features/scrolling/res/templates/scrolling.html
 2015-06-08 10:23:36 -07:00
Victor Woeltjen
3a36fda8ab Merge remote-tracking branch 'nasa/open1219' into open1229 
Merge changes for WTD-1219; WTD-1229

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
 2015-06-08 09:53:33 -07:00
Victor Woeltjen
88f938b1b6 [Limits] Begin using limits from scrolling list view 
WTD-1223.
 2015-06-05 17:59:58 -07:00
Victor Woeltjen
dc6c43a4cd [Limits] Display limit state in legend of plot 
WTD-1223.
 2015-06-05 17:15:02 -07:00
Charles Hacskaylo
e216961727 Pulling in all sass, css, etc. and static-markup work from warp1222 so far 2015-06-05 16:48:58 -07:00
Victor Woeltjen
f314e46abc [Limits] Add example limit capability 
WTD-1223.
 2015-06-05 16:48:09 -07:00
Victor Woeltjen
9a3ccc3295 [Limits] Merge in latest from platform 
Merge in latest changes to platform to begin implementing
limits, WTD-1223.
 2015-06-05 16:28:29 -07:00
Victor Woeltjen
d2a75c4338 [Info Bubble] Add test cases for gesture 
Add test cases for the info gesture, WTD-884.
 2015-06-05 06:31:23 -07:00
Victor Woeltjen
1567c32993 [Info Bubble] Add license headers 
Add license headers to scripts for info bubbles, WTD-884.
 2015-06-04 16:41:34 -07:00
Victor Woeltjen
21c066e10f [Info Bubble] Add test cases for infoService 
WTD-884.
 2015-06-04 16:38:55 -07:00
Victor Woeltjen
640b39e3a0 [Info Bubble] Begin adding tests 
Begin adding tests for info bubble, WTD-884.
 2015-06-04 16:27:41 -07:00
Victor Woeltjen
90ba93e396 [Info Bubble] Test metadata capability 
Test metadata capability, introduced to support info bubbles
for domain objects, WTD-884.
 2015-06-04 14:16:23 -07:00
Victor Woeltjen
87e80e763c [Info Bubble] Include in set of active bundles 
Include the info bubble in the set of active bundles, WTD-884.
 2015-06-04 12:35:42 -07:00
Victor Woeltjen
cae8372d34 [Info Bubble] Include type in common metadata 
Include type in common domain object metadata to display
in an info bubble, WTD-884.
 2015-06-04 12:34:56 -07:00
Victor Woeltjen
c9e33b1d31 [Info Bubble] Change moment import 
Change the path used to import moment for the telemetryFormatter.
Previously, a relative path was used; since telemetryFormatter was
initially implemented, however, moment has been made available as
simply moment by require configuration changes elsewhere. Inconsistent
usage of moment here can result in load timeouts under certain
script load orderings. Changed in the context of WTD-884 (which does
use moment elsewhere.)
 2015-06-04 12:32:37 -07:00
Victor Woeltjen
11dc5f380c [Info Bubble] Use domain object metadata 
Use domain object metadata to populate the info bubble from
the info gesture, WTD-884.
 2015-06-04 12:30:18 -07:00
Victor Woeltjen
6622ca7031 [Info Bubble] Add common properties to metadata 
Expose common properties (like time updated) from the metadata
capability, to appear in the Info bubble. WTD-884.
 2015-06-04 12:26:57 -07:00
Victor Woeltjen
cd26d1284e [Info Bubble] Add metadata capability 
Add metadata capability, which will be used to populate
contents of an info bubble. WTD-884.
 2015-06-04 12:09:50 -07:00
Victor Woeltjen
5f64e499f4 [Example] Work around JSLint 
JSLint doesn't like Express's use of static (a reserved word) as a
method name, so change the way it's accessed. WTD-1199.
 2015-06-04 10:47:04 -07:00
Victor Woeltjen
450bc059e4 Merge branch 'open-master' into open1199 2015-06-04 10:40:34 -07:00
Victor Woeltjen
588c35de4e Merge branch 'open-master' into open884 
Merge latest from master branch into topic branch for WTD-884
 2015-06-04 10:39:25 -07:00
Victor Woeltjen
fcd214ed60 [Forms] Show initial value in datetime control 
Initialize value for datetime control based on available
data, and keep up-to-date with changes from UI. Supports
clocks/timers, which use datetime as an entry field,
WTD-1221.
 2015-06-04 09:16:25 -07:00
Victor Woeltjen
2648f01966 [Composition] Disallow composition for leaf types 
Disallow composition for domain object types which will
not have a composition property; WTD-1221.
 2015-06-04 09:16:12 -07:00
Victor Woeltjen
e452921729 [Core] Revise explicit setting of modified timestamp 
Allow undefined as an explicit value for a domain
object's modification timestamp (as set via the
mutation capability.) Avoids a bug in minimal auto-refresh,
being added for WTD-1221.
 2015-06-04 09:16:08 -07:00
Victor Woeltjen
28805cd55c [Forms] Add test cases to DateTimeController 
Add test cases for behavioral changes to DateTimeController,
added for WTD-1221.
 2015-06-04 09:15:39 -07:00
Victor Woeltjen
45568ecb21 [Forms] Allow date-time controls to be optional 
Don't force date-time inputs to act as if they are
required; allow them to be treated as optional, but
enforce that this only occurs when left completely
empty (as opposed to partially complete.)

Supports WTD-1221.
 2015-06-04 09:15:04 -07:00
Charles Hacskaylo
6fe6aacc38 Added open source comment 2015-06-03 10:25:37 -07:00
Charles Hacskaylo
b022babedb Adding static-markup bundle. 2015-06-03 10:23:49 -07:00
Victor Woeltjen
a18a7c9960 [Layout] Fix comment 
Change inaccurate comment based on feedback from code
review for WTD-1182.
 2015-06-03 07:49:11 -07:00
Charles Hacskaylo
f23f127207 [Frontend] Markup and CSS for Time Controller 
WTD-1219
Markup, CSS, etc. for time controller;
New template .html file;
Rebuilt from open-master and ue-frontend branches;
 2015-06-02 19:29:57 -07:00
Charles Hacskaylo
c20ad3764d Merge branch 'open-master' into ue-frontend 
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/lists/_tabular.scss
 2015-06-02 18:26:49 -07:00
Charles Hacskaylo
48c4282416 Merge branch 'open-master' into ue-frontend 
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/lists/_tabular.scss
 2015-06-02 18:25:26 -07:00
Charles Hacskaylo
6104201d89 [Frontend] Markup and CSS for revised scrolling tabular view 
WTD-1217
 2015-06-02 17:45:39 -07:00
Charles Hacskaylo
0fbb54add3 Merging ue-frontend 2015-06-02 17:44:59 -07:00
Charles Hacskaylo
b09ec23617 [Frontend] Renew of ue-frontend 
Picks up markup and CSS changes from
open1174 (breadcrumbs)
 2015-06-02 16:12:19 -07:00
Victor Woeltjen
ca4f37b259 [Licenses] Remove license header scripts 
Remove scripts for license headers, WTD-1051.
 2015-06-02 11:48:23 -07:00
Victor Woeltjen
99e5feb9dc [Licenses] Change link for normalize 
WTD-1051.
 2015-05-29 10:37:06 -07:00
Victor Woeltjen
ff1d4854a8 Revert "[Licenses] Remove license ref from dialog" 
This reverts commit 2ca789e36a.
Change was made to misunderstanding of instructions; WTD-1051.
 2015-05-29 10:08:43 -07:00
Victor Woeltjen
1415e9e72f [Licenses] Add missing copyright/license info 
WTD-1051.
 2015-05-29 10:05:59 -07:00
Victor Woeltjen
8156dd967f [Licenses] Reorganize licenses file 
Reorganize licenses file; remove full text of Apache notice, move
other Apache-licensed dependencies to the top. WTD-1051.
 2015-05-29 09:22:13 -07:00
Victor Woeltjen
61bc662efb [Licenses] Add missing copyright years 
WTD-1051.
 2015-05-22 14:48:53 -07:00
Victor Woeltjen
219a6086d8 [Info Bubble] Remove placeholder type/view 
Remove Info Bubble as a type and view, which had been present
for purposes of example during development. WTD-884.
 2015-05-22 13:27:04 -07:00
Victor Woeltjen
69dce9f88d [Info Bubble] Add clarifying comments 
Add clarifying comments for the info gesture, WTD-884.
 2015-05-22 13:25:39 -07:00