Victor Woeltjen
|
fa77139077
|
[Code Style] Run gulp fixstyle
...to apply code style settings from #142.
|
2016-05-19 11:29:13 -07:00 |
|
Henry
|
44f4a82fa1
|
Resolved merge conflicts
|
2016-05-12 16:14:31 -07:00 |
|
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 |
|
Victor Woeltjen
|
530b940a64
|
[Timeline] Fix reordering
Fix reordering behavior when dragging-and-dropping within timelines;
addresses #789.
|
2016-03-29 19:46:30 -07:00 |
|
Victor Woeltjen
|
cb655d486b
|
[Timeline] Test reordering within parent
|
2016-03-22 17:06:58 -07:00 |
|
Victor Woeltjen
|
b2337dea97
|
[Timeline] Update failing specs
...and remove obsolete test case for handling drops in a timeline
|
2016-03-22 16:59:09 -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
|
5274923c49
|
[Licenses] Add license headers
...to sources for Clocks/Timers and Timelines, as noted in
review nasa/openmctweb#207
|
2015-11-05 12:45:51 -08:00 |
|
Victor Woeltjen
|
c932e953bc
|
[Plugins] Bring over timeline, clock plugins
WTD-1239
|
2015-09-14 16:45:41 -07:00 |
|