Victor Woeltjen
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
Pete Richards
c591ade479
Merge remote-tracking branch 'origin/781'
2016-04-06 10:35:40 -07:00
Victor Woeltjen
70acef6905
[Instantiation] Ensure new models have modified timestamp
...
...to avoid https://github.com/nasa/openmct/issues/745#issuecomment-204561163
2016-04-01 14:27:26 -07:00
Charles Hacskaylo
88784d37fd
[Frontend] Added priority
...
#787
2016-03-24 12:05:10 -07:00
Charles Hacskaylo
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
Victor Woeltjen
3fe41575bd
[Add] Add missing dependency
...
...to support caching of domain objects created during edit mode.
2016-03-21 10:31:09 -07:00
Victor Woeltjen
17faf000b0
[Add] Cache models on instantiation
...
...to remove need for Edit to persist these immediately, which in
turn causes #770 and #678
2016-03-21 10:20:14 -07:00
Charles Hacskaylo
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
Victor Woeltjen
ac5ac8d34e
[Build] Remove boilerplate from scripts
...
No longer necessary after JSHint configuration.
2016-03-04 10:46:38 -08:00
Victor Woeltjen
73324ce338
[Build] Update run-time licenses
...
Update licensing info shown in run-time Licenses page
available form About dialog.
2016-02-03 17:32:16 -08:00
Victor Woeltjen
c3f819fa8c
[Build] Begin adding build info
2016-01-28 17:08:02 -08:00
Henry
66e827de2e
Fixed Outstanding issues from merge
2016-01-14 18:51:53 -08:00
Henry
3e7eb11d84
Regenerated bundles
2016-01-14 17:08:19 -08:00