Charles Hacskaylo
68f3cd087d
[Frontend] Mods in progress to form layout
...
open #638
In progress;
2016-02-04 14:23:29 -08:00
Charles Hacskaylo
115ffe7963
[Frontend] Fixes to scrolling and layout in Inspector
...
open #638
In progress;
2016-02-04 14:23:29 -08:00
Henry
e3a0cae5fd
[Plot] #638 Fleshing out form structures
2016-02-04 14:23:29 -08:00
Henry
6fb6761abf
[Plots] #638 New plot display options
2016-02-04 14:23:28 -08:00
Victor Woeltjen
aebae27391
[Tests] Remove suite.json files
...
Remove obsolete suite.json files; #482
2016-02-02 09:35:50 -08:00
Henry
032b2542f0
Merged from Master
2016-01-14 17:23:53 -08:00
Henry
3e7eb11d84
Regenerated bundles
2016-01-14 17:08:19 -08:00
Henry
826d39a749
[New Edit Mode] Fixed logic in EditActionPolicy to use positive logic
2016-01-14 15:02:22 -08:00
Charles Hacskaylo
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
Victor Woeltjen
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
Victor Woeltjen
cec197f888
[API Refactor] Remove bundle.json files
2016-01-08 15:32:18 -08:00
Victor Woeltjen
de53247d56
[API] Convert JSON bundles to imperative form
2016-01-07 15:08:08 -08:00
Victor Woeltjen
a49deb5ab1
Merge remote-tracking branch 'github/master' into open116
...
Merge in latest from master into topic branch for
https://github.com/nasa/openmctweb/issues/116
Conflicts:
platform/features/layout/test/FixedControllerSpec.js
platform/features/plot/test/PlotControllerSpec.js
2015-12-30 10:15:05 -08:00
Victor Woeltjen
9b63a63efc
Merge pull request #379 from nasa/open1337
...
[Limits] Add test cases for limits
2015-12-30 10:11:27 -08:00
Victor Woeltjen
c436bcce0a
[Time Conductor] Test updated fixed position behavior
...
Verify interactions from FixedControllers on events
issued by the time conductor.
2015-12-30 09:29:24 -08:00
Henry
cf73f3a0c4
Moved gesture from individual views up to browse-object.html for now to resolve #423
2015-12-11 16:42:05 -08:00
Henry
49579378dd
[New Edit Mode] Fixed positioning of dropped objects #386
2015-12-09 09:51:00 -08:00
Henry
b5c741c911
Merge branch 'master' into open199
2015-12-08 15:42:37 -08:00
Victor Woeltjen
038322e9aa
[Layout] Update raw positions on drop
...
When handling a drop into the layout, store the panel's
new position to the LayoutController's internal table of
raw positions (in addition to writing it to the configuration.)
Avoids https://github.com/nasa/openmctweb/issues/384
2015-12-08 15:08:30 -08:00
Henry
18607e9404
Merged from Master
2015-12-07 20:42:09 -08:00
Victor Woeltjen
33c372765f
[Limits] Test limit usage from Fixed Position
...
WTD-1337
2015-12-07 12:33:29 -08:00
Henry
6fb6f54cfa
Fixed objects being dropped twice in fixed layout
2015-11-27 15:21:24 -08:00
Henry
db7224486c
[Layout] Layout rebuilds after resize/reposition - Fixed potential race condition #32
2015-11-25 19:11:29 -08:00
Henry
6d0f3c7faa
[Layout] Layout rebuilds after resize/reposition #32
...
Refactored layoutPanels method
Fixed JSLint errors
fixed failing tests
2015-11-25 15:30:33 -08:00
Henry
988323bdbd
merged Open32
2015-11-25 14:59:47 -08:00
Henry
c84de00e80
[Layout] Layout rebuilds after resize/reposition #32
2015-11-24 21:51:10 -08:00
Henry
b27b60aedc
Merge branch 'master' into open199
2015-11-17 14:30:57 -08:00
akhenry
b7eb9491cb
Merge pull request #275 from nasa/open271
...
[Layout] Enforce minimum size on drop
2015-11-12 16:10:50 -08:00
Charles Hacskaylo
608df8f7b8
Merging in latest github master; resolved conflicts
2015-11-10 16:13:46 -08:00
Victor Woeltjen
fdf6148811
[Layout] Enforce minimum size on drop
...
Addresses nasa/openmctweb#271 , ensuring frames in a layout
are not too tiny to use, even if the grid size is small.
2015-11-09 17:58:20 -08:00
Charles Hacskaylo
4e79de6156
[Frontend] Apply flex layout to object header elements
...
open #250
open #260
vista#132
Major refactoring to markup and CSS to apply
flex layout strategy to object headers;
Flex necessary to fix 'overflow: hidden' setting
applied in open90 to object-browse-bar that
was preventing the view switcher menu from
appearing;
Browse, edit, mobile, frames in layouts, etc. all
visually checked in a first go round;
Mobile classes tweaked to fix left and right
margin problems resulting from open90 changes;
z-indexing of Inspector pane and splitters changed
to allow primary pane elements to overflow beneath
when primary pane width is severely constrained;
2015-11-06 17:42:54 -08:00
Andrew Henry
92573b817f
Added drag to enable edit mode
2015-10-20 21:03:36 -07:00
Victor Woeltjen
1efa97e6f5
Merge remote-tracking branch 'github/master' into open115b
...
Conflicts:
platform/features/conductor/src/ConductorRepresenter.js
2015-10-09 10:32:43 -07:00
Charles Hacskaylo
333f7cb848
[Frontend] Time controller-related styling
...
open #1515
open #117
Markup changed to utilize mct-representation via CSS;
time-controller now uses list-based _constants values;
ConductorRepresenter.js modded to remove inline styling
and to add CSS classes to enclosing mct-representation;
2015-09-29 08:43:34 -07:00
Victor Woeltjen
4ced6c44a6
[Time Conductor] Ignore empty series
...
...when updating Fixed Position view.
2015-09-24 17:01:50 -07:00
Victor Woeltjen
0260e6fff4
Merge branch 'open1515' into open115
2015-09-23 16:05:09 -07:00
Charles Hacskaylo
9811443c71
Merge branch 'master' into open117
2015-09-23 15:54:48 -07:00
Victor Woeltjen
056b0c8c5b
[Fixed Position] Use spaces instead of tabs
...
...to satisfy code style checker and pass build,
in preparation for merge. nasa/openmctweb#118
2015-09-23 12:59:04 -07:00
Victor Woeltjen
dbe1875e70
[Themes] Resolve conflicts
...
Resolve conflicts in preparation for merge, nasa/openmctweb#118
2015-09-22 16:12:44 -07:00
Pete Richards
480da3476e
Merge branch 'mobile' into mobile-integration
2015-09-22 10:55:43 -07:00
Charles Hacskaylo
65368ed0c3
[Config] Removed non-functional config options from Create dialogs;
...
open #124
Removed "Default view" and "Display title by default" from
Panel configs;
2015-09-18 13:43:29 -07:00
Charles Hacskaylo
f28d2f19d0
[Frontend/PLATFORM] Cherry picking from platform changes in vista65
...
open #95
vista #65
scss and html mods for VISTA-related elements;
(cherry picked from commit 6ef3987)
2015-09-16 17:17:54 -07:00
Victor Woeltjen
190f5fd0ea
[Time Conductor] Update failing specs
...
WTD-1515
2015-09-16 15:23:08 -07:00
Victor Woeltjen
ad29fb0f92
[Time Conductor] Populate FP from historical
...
Populate fixed position view from historical
telemetry when first loaded. WTD-1515
2015-09-16 13:38:47 -07:00
Charles Hacskaylo
3e5d46a62b
[Frontend] IN-PROGRESS Theme changes continuing
...
open #95
Limits, plots, etc.;
Misc sanding and shimming;
Updated symbols font to replace missing
Info symbol;
2015-09-11 16:25:19 -07:00
Victor Woeltjen
e3b191b5dc
[Time Controller] Update failing specs
...
Update failing specs to reflect support for time conductor,
WTD-1515
2015-09-09 16:52:46 -07:00
Victor Woeltjen
a4dda695dd
[Time Controller] Get conductor working with fixed pos.
...
WTD-1515
2015-09-09 16:46:00 -07:00
Victor Woeltjen
fdbc91131b
[Time Controller] Update bundle definition
...
...for Fixed Position view to reflect changes to dependencies,
WTD-1515.
2015-09-08 17:18:39 -07:00
Victor Woeltjen
d2dfec3ce7
[Time Controller] Simplify retrieval of datum objects
...
...for historical data. Supports WTD-1515
2015-09-08 17:03:58 -07:00
Victor Woeltjen
760f4b818f
[Time Conductor] Update fixed position from history
...
WTD-1515
2015-09-08 16:53:06 -07:00
