Pete Richards
f3b265bdd5
Merge branch 'master' into open671
2016-05-09 10:19:24 -07:00
Victor Woeltjen
3efaa3b1cb
Merge pull request #894 from nasa/open892
...
#892 Removed browser warning
2016-05-06 09:51:36 -07:00
Henry
00433f02bc
#892 Removed browser warning
2016-05-05 21:45:18 -07:00
Pete Richards
7fad4e9ea1
[General] remove dupe, debounce inputs
...
Remove duplicate ClickAwayController implementation that was obscuring actual
implementation. Debounce clickaway action in case toggle is invoked in a
click handler.
Resolves https://github.com/nasa/openmct/issues/888
2016-05-05 18:25:37 -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
Charles Hacskaylo
da1e6750a0
[Frontend] Removed reset.css and refs to modernizr
...
#700
Removed reset.css; Removed refs to
modernizr from licenses and readme.md;
2016-03-16 14:44:01 -07:00
Victor Woeltjen
f7ba24c0b6
[Tree] Enable gestures on labels
2016-03-11 17:43:18 -08:00
Victor Woeltjen
217e697079
[Tree] Display selection state
2016-03-11 17:26:00 -08:00
Victor Woeltjen
d4b15525ca
[Tree] Begin using mct-tree for tree representation
2016-03-11 14:23:08 -08:00
Victor Woeltjen
4f293f22a6
[Tree] Add Zepto dependency
...
...to support implementation of a jQuery-less tree.
2016-03-11 12:38:40 -08:00
Victor Woeltjen
ac5ac8d34e
[Build] Remove boilerplate from scripts
...
No longer necessary after JSHint configuration.
2016-03-04 10:46:38 -08:00
Andrew Henry
7daaecbf8f
Merge pull request #710 from nasa/open673
...
[Templates] Load templates using RequireJS text plugin
2016-02-29 18:45:46 +00:00
Victor Woeltjen
8581547a9c
[Templates] Allow only template property for containers
...
...to work around difficulties with transclusion using
templateLinker.
2016-02-26 14:49:55 -08:00
Victor Woeltjen
e61711688e
[Templates] Use templateLinker from MCTContainer
...
...for compatibility with both template and templateUrl.
2016-02-26 14:24:41 -08:00
Victor Woeltjen
bf1fa0ac4c
[Templates] Include templates using text plugin
...
Resolves #673
2016-02-26 13:07:50 -08:00
Charles Hacskaylo
99cf690ad4
Merge branch 'master' into open164
2016-02-23 16:03:24 -08:00
Pete Richards
4d800d26e2
[CSS] Add reset to replace compass/reset
...
Add reset.css which replaces compass/reset.
https://github.com/nasa/openmctweb/issues/698
2016-02-22 18:18:06 -08:00
Pete Richards
25f3b1e110
[Frontend] Add splash screen manager
...
Add a runtime extension that detects the splash screen and triggers a fade out
after the application has loaded. Once the fade out has ended, it removes the
element from the page.
Related to https://github.com/nasa/openmctweb/issues/164
2016-02-22 16:39:20 -08:00
Victor Woeltjen
dbf196e014
Merge remote-tracking branch 'github/master' into open477
...
Resolve conflicts to complete merge of #477
Conflicts:
platform/commonUI/general/bundle.json
platform/commonUI/themes/espresso/res/css/theme-espresso.css
platform/commonUI/themes/snow/res/css/theme-snow.css
2016-01-27 12:53:46 -08:00
Henry
3e7eb11d84
Regenerated bundles
2016-01-14 17:08:19 -08:00
