Commit Graph

39 Commits

Author SHA1 Message Date
aebae27391 [Tests] Remove suite.json files
Remove obsolete suite.json files; #482
2016-02-02 09:35:50 -08:00
032b2542f0 Merged from Master 2016-01-14 17:23:53 -08:00
3e7eb11d84 Regenerated bundles 2016-01-14 17:08:19 -08:00
4f7ca98b60 Merge branch 'master' into nem468a.
Many tweaks to fix some issues with tree, labels and Inspector.

Conflicts:
	platform/commonUI/edit/res/templates/elements.html
	platform/commonUI/general/res/sass/search/_search.scss
	platform/commonUI/general/res/sass/tree/_tree.scss
	platform/commonUI/general/res/templates/object-inspector.html
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
	platform/search/res/templates/search.html
2016-01-11 13:29:26 -08:00
0036974c60 Merge remote-tracking branch 'github/master' into open450b
Merge latest from master branch to reconcile conflicts
for https://github.com/nasa/openmctweb/pull/469

Conflicts:
	platform/commonUI/general/bundle.json
2016-01-08 15:36:10 -08:00
cec197f888 [API Refactor] Remove bundle.json files 2016-01-08 15:32:18 -08:00
de53247d56 [API] Convert JSON bundles to imperative form 2016-01-07 15:08:08 -08:00
2358541d91 [Time Conductor] Update RangeColumn spec
Update RangeColumn spec. Changes appear to have been related
to limits (WTD-1337), but making changes in the context of
updating tests for time conductor,
https://github.com/nasa/openmctweb/issues/116
2015-12-30 10:10:23 -08:00
1ceb6d2d96 [Frontend] Fixed scrolling view
open #199
open #293
open #201
Removed fixed-header class from table markup;
(cherry picked from commit 6c4bdca)
2015-11-12 13:24:28 -08:00
e5ebbdaf7f [Time Conductor] Use domain formats in scrolling list 2015-10-27 12:37:53 -07:00
d0478c3433 [Scrolling List] Check for existence of limit
Check for existence of limit capability while evaluating
limits in a scrolling list view. WTD-1515
2015-09-14 16:37:29 -07:00
7fe866060b [Code Style] Use prototypes in forms bundle
WTD-1482.
2015-08-14 13:44:08 -07:00
6302eee17e [Code Style] Use prototypes in Scrolling List bundle
WTD-1482.
2015-08-13 12:35:48 -07:00
31eb366e7f [JSDoc] Add namespace docs
WTD-1482.
2015-08-07 12:13:15 -07:00
c08a460d30 [JSDoc] Add annotations
Bulk-add JSDoc annotations, WTD-1482.
2015-08-07 11:44:54 -07:00
38ad8058e8 Merge remote-tracking branch 'origin/open1223' into open-1338
Resolve merge conflicts due to whitespace changes.
2015-06-29 12:08:16 -07:00
065a5a6fbf [Limits] Disable failing specs
Disable specs which are failing after changes to support
limits, WTD-1223.
2015-06-23 13:43:00 -07:00
ae7dae011b [Dev/Frontend] New example event generator and event view
WTD-1304
github open18
New example generator;
New temporary view: features/events;
Updated scss and css;
2015-06-19 15:29:06 -07:00
51852e1322 [Limits] Use datum for limits in scrolling list view
Utilize 'datum' API when displaying limits in a scrolling list
view, WTD-1223.
2015-06-09 10:07:00 -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
4ab36bd421 [Limits] Show limits from scrolling list view
WTD-1223.
2015-06-08 11:57:05 -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
88f938b1b6 [Limits] Begin using limits from scrolling list view
WTD-1223.
2015-06-05 17:59:58 -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
6104201d89 [Frontend] Markup and CSS for revised scrolling tabular view
WTD-1217
2015-06-02 17:45:39 -07:00
10863514cb [Licenses] Add license headers
WTD-1051.
2015-05-13 16:43:30 -07:00
58bd4240f1 [Frontend] Merging warp1172 platform changes in
WTD-1172
(cherry picked from commit 219ffb4d59d4cc4a0172ba351af0e2b5d672d4b2)

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/_fixed-position.scss
	warp/telemetry/src/autoflow/AutoflowTableLinker.js

Manually deleted AutoflowTableLinker.js
2015-05-07 13:10:04 -07:00
db74e2f84a [Frontend] CSS hooks for staleness
WTD-1172
New .scss file for staleness
Added CSS hooks in templates for staleness
2015-05-06 17:36:55 -07:00
f114f742c4 [Frontend] Tweaks to markup and CSS
WTD-1172
scrolling.html markup and CSS hooks;
added comments to change points;
CSS tweaking;
2015-05-06 16:55:25 -07:00
b915a90305 [Views] Fix glyphs
Use correct glyphs for Plot, Scrolling, and Items views.
WTD-734.
2015-01-27 14:50:45 -08:00
5414c4c2d0 [Telemetry] Update scrolling list specs
Update specs for columns in scrolling list view to reflect
that the formatting of domain/range values for display
has now been moved into a reusable injectable service for
WTD-599.
2014-12-24 12:22:55 -08:00
78b636dafe [Telemetry] Update plot specs
Update plot specs to reflect refactoring out of formatter
for telemetry values, WTD-599.
2014-12-24 12:17:05 -08:00
1ed67629e6 [Telemetry] Add missing JSDoc
Add missing in-line documentation to ScrollingListPopulator;
noticed in the context of work done for WTD-599,
refactoring of time- and value-formatting for telemetry
into a reusable, injectable service.
2014-12-24 11:33:19 -08:00
44b16f9dd9 [Telemetry] Use telemetryFormatter in scrolling list
Use the injected telemetryFormatter in scrolling
list views, instead of replicating this functionality.
WTD-599.
2014-12-24 11:23:59 -08:00
a1edb6047c [Scrolling] Complete specs for scrolling lists
Complete specs for scrolling list views, WTD-534.
2014-12-02 16:15:28 -08:00
e953e5b4b4 [Scrolling] Fill in specs
Fill in specs for ScrollingListController, and for
the specific Column types that support it. Separate
out the code that produces actual rows in order to
improve testability and maintainability. WTD-534.
2014-12-02 15:59:09 -08:00
c0a34149ca [Scrolling] Add empty tests
Add empty tests for scripts associated with the scrolling
list view. WTD-534.
2014-12-02 15:25:23 -08:00
e711073cb5 [Scrolling] Add JSDoc, clean up
Clean up scripts for Scrolling List view and add
some JSDoc. WTD-534.
2014-12-02 15:21:26 -08:00
d304cc4343 [Scrolling] Bring in scrolling list view
Bring in scrolling list view from the sandbox branch
in preparation for clean up, testing, and integration
to complete transition of scrolling list views,
WTD-534.
2014-12-02 14:51:48 -08:00