Commit Graph

4585 Commits

Author SHA1 Message Date
7a93b7d77a Pulled in final sanding on bubbles.scss from open1222 2015-06-09 09:32:28 -07:00
781a1a4be5 [Limits] Add metadata to SWGs
Add telemetry metadata to Sine Wave Generators to support
utilizing telemetry in a 'datum' format, to match designed
API for WTD-1223.
2015-06-09 09:31:22 -07:00
277b8e74b6 [Frontend] Final sanding on bubbles.scss
WTD-1222
2015-06-09 09:28:59 -07:00
cec115976c Merged latest from open-master and open1222 platform/ 2015-06-08 16:00:24 -07:00
35b5b29d03 [Limits] Use datum for scrolling list
Use notion of a datum from scrolling list view when
evaluating limits, WTD-1223.
2015-06-08 15:34:17 -07:00
2a4bf7b95a [Limits] Use datum for plots
Use datum for limits in a plot, WTD-1223.
2015-06-08 15:33:41 -07:00
ea3be6db49 [Limits] Use datum for sinewave limits
Use forward-looking notion of a datum for sine wave
generator limits, WTD-1223.
2015-06-08 15:32:24 -07:00
4544167b50 [Telemetry] Provide latest telemetry datum
Provide latest telemetry as a datum to begin transitioning
toward revised telemetry API, particularly as used from limits;
WTD-1223.
2015-06-08 15:26:02 -07:00
1587e66d9e [Frontend] Added local zoom/reset controls
WTD-1222
Refactored scss in plots-main slightly;
Removed unused sass/plots.scss;
2015-06-08 15:24:17 -07:00
5aad1b4e30 [Frontend] Removing unused firs-order scss file 2015-06-08 15:08:43 -07:00
03252aac1b [Frontend] Ported over all /platform changes from warp1222
WTD-1222
2015-06-08 13:50:54 -07:00
b18159b8e1 Merging in latest from ue-frontend 2015-06-08 13:45:31 -07:00
4ab36bd421 [Limits] Show limits from scrolling list view
WTD-1223.
2015-06-08 11:57:05 -07:00
31e0e0adc7 Merge pull request #3 from nasa/open-1201
[Integration] Window Titling
2015-06-08 11:27:42 -07:00
689701b37f [Licenses] Add License Header 2015-06-08 11:23:25 -07:00
9f90c6b8d8 [Frontend] Updated CSS; removed position: relative
WTD-884
2015-06-08 11:14:58 -07:00
eb1621dad9 Merge branch 'open1200' into open-1201 2015-06-08 11:11:50 -07:00
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
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
88f938b1b6 [Limits] Begin using limits from scrolling list view
WTD-1223.
2015-06-05 17:59:58 -07:00
dc6c43a4cd [Limits] Display limit state in legend of plot
WTD-1223.
2015-06-05 17:15:02 -07:00
e216961727 Pulling in all sass, css, etc. and static-markup work from warp1222 so far 2015-06-05 16:48:58 -07:00
f314e46abc [Limits] Add example limit capability
WTD-1223.
2015-06-05 16:48:09 -07:00
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
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
1567c32993 [Info Bubble] Add license headers
Add license headers to scripts for info bubbles, WTD-884.
2015-06-04 16:41:34 -07:00
21c066e10f [Info Bubble] Add test cases for infoService
WTD-884.
2015-06-04 16:38:55 -07:00
640b39e3a0 [Info Bubble] Begin adding tests
Begin adding tests for info bubble, WTD-884.
2015-06-04 16:27:41 -07:00
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
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
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
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
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
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
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
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
450bc059e4 Merge branch 'open-master' into open1199 2015-06-04 10:40:34 -07:00
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
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
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
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
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
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
6fe6aacc38 Added open source comment 2015-06-03 10:25:37 -07:00
b022babedb Adding static-markup bundle. 2015-06-03 10:23:49 -07:00
a18a7c9960 [Layout] Fix comment
Change inaccurate comment based on feedback from code
review for WTD-1182.
2015-06-03 07:49:11 -07:00
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
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
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
6104201d89 [Frontend] Markup and CSS for revised scrolling tabular view
WTD-1217
2015-06-02 17:45:39 -07:00