b6502e9ea1
[New Edit Mode] #633 Removed Editing workflow concerns from FixedController, LayoutController
2016-05-20 14:12:24 -07:00
fa77139077
[Code Style] Run gulp fixstyle
...
...to apply code style settings from #142 .
2016-05-19 11:29:13 -07:00
5e44bfc6c7
Merge branch 'master' into open671
...
Conflicts:
main.js
platform/commonUI/edit/src/policies/EditableMovePolicy.js
platform/commonUI/general/src/directives/MCTTree.js
platform/commonUI/general/src/ui/ToggleView.js
platform/core/src/actions/ActionCapability.js
platform/core/test/models/CachingModelDecoratorSpec.js
platform/core/test/services/InstantiateSpec.js
platform/features/events/bundle.js
platform/features/events/src/DomainColumn.js
platform/features/events/src/EventListController.js
platform/features/events/src/EventListPopulator.js
platform/features/events/src/RangeColumn.js
platform/features/events/src/directives/MCTDataTable.js
platform/features/events/src/policies/MessagesViewPolicy.js
platform/features/events/test/DomainColumnSpec.js
platform/features/events/test/EventListControllerSpec.js
platform/features/events/test/EventListPopulatorSpec.js
platform/features/events/test/RangeColumnSpec.js
platform/features/events/test/policies/MessagesViewPolicySpec.js
platform/features/rtevents/bundle.js
platform/features/rtevents/src/DomainColumn.js
platform/features/rtevents/src/RTEventListController.js
platform/features/rtevents/src/RangeColumn.js
platform/features/rtevents/src/directives/MCTRTDataTable.js
platform/features/rtevents/src/policies/RTMessagesViewPolicy.js
platform/features/rtevents/test/DomainColumnSpec.js
platform/features/rtevents/test/RTEventListControllerSpec.js
platform/features/rtevents/test/RangeColumnSpec.js
platform/features/rtevents/test/policies/RTMessagesViewPolicySpec.js
platform/features/rtscrolling/bundle.js
platform/features/rtscrolling/src/DomainColumn.js
platform/features/rtscrolling/src/NameColumn.js
platform/features/rtscrolling/src/RTScrollingListController.js
platform/features/rtscrolling/src/RangeColumn.js
platform/features/scrolling/src/DomainColumn.js
platform/features/scrolling/src/RangeColumn.js
platform/features/scrolling/src/ScrollingListController.js
platform/features/scrolling/src/ScrollingListPopulator.js
platform/features/scrolling/test/DomainColumnSpec.js
platform/features/scrolling/test/RangeColumnSpec.js
platform/features/scrolling/test/ScrollingListControllerSpec.js
platform/features/scrolling/test/ScrollingListPopulatorSpec.js
platform/features/table/src/directives/MCTTable.js
platform/features/table/test/controllers/TelemetryTableControllerSpec.js
platform/representation/src/gestures/DropGesture.js
platform/telemetry/src/TelemetryFormatter.js
test-main.js
2016-04-08 16:08:19 -07:00
88784d37fd
[Frontend] Added priority
...
#787
2016-03-24 12:05:10 -07:00
594f3b8ec2
[Frontend] Corrected wrong unicode value
...
#781
2016-03-23 19:30:20 -07:00
b08d00ef3e
[Frontend] Removed tab character
...
#781
2016-03-23 19:25:25 -07:00
7da1a4b2a3
[Frontend] Updated glyph defs and descriptions
...
#781
#187
Converted many glyph char defs to
their JSON unicode equivalents;
Updated descriptions for many domain
objects;
2016-03-23 19:04:32 -07:00
3258342783
[Frontend] Further cleanups to form elements
...
#700
#689
#740
Removed _selects.scss and moved classes
into _controls.scss;
Reorg'd _controls;
Moved classes into _elems.scss;
Added and fixed cssclass defs in multiple
bundle.js files to allow better field widths
in overlay dialogs;
Fixed overlay custom scrollbar colors;
Fixed alignment of required glyphs in forms;
2016-03-16 14:40:06 -07:00
d6ec7e9ab8
[Build] Remove unused variables from specs
...
...to satisfy JSHint.
2016-03-04 12:56:14 -08:00
a1a7b2b8ce
[Build] Remove unused variables
...
...to satisfy JSHint
2016-03-04 11:41:48 -08:00
ac5ac8d34e
[Build] Remove boilerplate from scripts
...
No longer necessary after JSHint configuration.
2016-03-04 10:46:38 -08:00
3a6e0be2d7
[Templates] Update FixedController spec
...
...to reflect changes to how selection object is obtained,
which in turn reflects change to using templates obtained
via RequireJS text plugin, instead of loading by URL.
2016-02-26 16:19:14 -08:00
931fa77cbe
[Templates] Handle deferred selection availability
...
Loading templates via RequireJS text plugin means they are
immediately available; appears to have caused a change in
ordering wherein controllers for views may be initialized
before representers have installed things like selection
state. As such, need to watch for changes instead of simply
checking for a selection object when the controller is
initialized.
2016-02-26 15:37:19 -08:00
bf1fa0ac4c
[Templates] Include templates using text plugin
...
Resolves #673
2016-02-26 13:07:50 -08:00
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
826d39a749
[New Edit Mode] Fixed logic in EditActionPolicy to use positive logic
2016-01-14 15:02:22 -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
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
9b63a63efc
Merge pull request #379 from nasa/open1337
...
[Limits] Add test cases for limits
2015-12-30 10:11:27 -08:00
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
cf73f3a0c4
Moved gesture from individual views up to browse-object.html for now to resolve #423
2015-12-11 16:42:05 -08:00
49579378dd
[New Edit Mode] Fixed positioning of dropped objects #386
2015-12-09 09:51:00 -08:00
b5c741c911
Merge branch 'master' into open199
2015-12-08 15:42:37 -08:00
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
18607e9404
Merged from Master
2015-12-07 20:42:09 -08:00
33c372765f
[Limits] Test limit usage from Fixed Position
...
WTD-1337
2015-12-07 12:33:29 -08:00
6fb6f54cfa
Fixed objects being dropped twice in fixed layout
2015-11-27 15:21:24 -08:00
db7224486c
[Layout] Layout rebuilds after resize/reposition - Fixed potential race condition #32
2015-11-25 19:11:29 -08:00
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
988323bdbd
merged Open32
2015-11-25 14:59:47 -08:00
c84de00e80
[Layout] Layout rebuilds after resize/reposition #32
2015-11-24 21:51:10 -08:00
b27b60aedc
Merge branch 'master' into open199
2015-11-17 14:30:57 -08:00
b7eb9491cb
Merge pull request #275 from nasa/open271
...
[Layout] Enforce minimum size on drop
2015-11-12 16:10:50 -08:00
608df8f7b8
Merging in latest github master; resolved conflicts
2015-11-10 16:13:46 -08:00
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
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
92573b817f
Added drag to enable edit mode
2015-10-20 21:03:36 -07:00
1efa97e6f5
Merge remote-tracking branch 'github/master' into open115b
...
Conflicts:
platform/features/conductor/src/ConductorRepresenter.js
2015-10-09 10:32:43 -07:00
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
4ced6c44a6
[Time Conductor] Ignore empty series
...
...when updating Fixed Position view.
2015-09-24 17:01:50 -07:00
0260e6fff4
Merge branch 'open1515' into open115
2015-09-23 16:05:09 -07:00
9811443c71
Merge branch 'master' into open117
2015-09-23 15:54:48 -07:00
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
dbe1875e70
[Themes] Resolve conflicts
...
Resolve conflicts in preparation for merge, nasa/openmctweb#118
2015-09-22 16:12:44 -07:00
480da3476e
Merge branch 'mobile' into mobile-integration
2015-09-22 10:55:43 -07:00
