Commit Graph

26 Commits

Author SHA1 Message Date
11e06039ec Merge branch 'master' into open933 2016-09-13 13:25:37 -07:00
d490693bad [Build] Update to es6-promise 3.3.0
...including changes to filename associated with that version.

Fixes #1183
2016-09-13 11:20:58 -07:00
a1331b7bb3 Merge branch 'master' into open933 2016-09-12 16:54:45 -07:00
40ad9c47a8 [Tests] Add jsPDF and html2canvas 2016-09-03 13:51:16 +09:00
4cf6126d35 Refactoring based on feedback
Refactoring controller

Migrating functions off controller onto service class

Simplified modes

Adding comments

Removed unnecessary validation

Fixing testing issues
2016-08-23 18:10:05 +01:00
c699cb8b4b Merge remote-tracking branch 'origin/master' into open933-c
# Conflicts:
#	platform/commonUI/edit/res/templates/create/create-menu.html
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
#	platform/commonUI/general/res/sass/_archetypes.scss
#	platform/commonUI/general/res/sass/_constants.scss
#	platform/commonUI/general/res/sass/_icons.scss
#	platform/commonUI/general/res/sass/_main.scss
#	platform/commonUI/general/res/sass/_mixins.scss
#	platform/commonUI/general/res/sass/controls/_buttons.scss
#	platform/commonUI/general/res/templates/controls/time-controller.html
#	platform/commonUI/themes/snow/res/sass/_constants.scss
2016-08-01 17:11:37 -07:00
59436f7b45 [Tests] Load all sources (#1098)
Load all source files when running Karma's test suite; this
ensures that code coverage metrics are not invalidated by
missing files. Fixes #1090.
2016-07-28 10:45:38 -07:00
c8898ac6aa [Documentation] Updated copyright statement. Fixes #1081 2016-07-12 16:55:57 -07:00
bca5eb0fdb [Time Conductor] #933 Initial markup 2016-07-07 09:47:46 -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
0e1df444df [Tree] Update test configuration
...to account for new dependency on Zepto (and its necessary
shim.)
2016-03-14 12:21:58 -07:00
4f293f22a6 [Tree] Add Zepto dependency
...to support implementation of a jQuery-less tree.
2016-03-11 12:38:40 -08:00
6289fe333b [Build] Declare screenfull
...and shim such that it can be acquired in the normal AMD way.
Avoids use of global variable to satisfy JSHint.
2016-03-04 11:05:08 -08:00
cb0f191ab3 [CSV Export] Add FileSaver dependency
...to handle export part of CSV export.
2016-02-05 14:39:28 -08:00
8868b6a130 [CSV Export] Begin testing exportService
...including fixes to immediately-identified errors.
2016-02-05 13:32:21 -08:00
e564baba1a [Build] Update test runner 2016-01-29 10:26:47 -08:00
db7560c31f [Test] Use PhantomJS to run tests
Switch Karma to use PhantomJS to run tests.  CI machines no longer
need to have Chrome installed.

Implemented after changes to build process due to imperative registration.

https://github.com/nasa/openmctweb/issues/450
2016-01-18 13:57:32 -08:00
69c5b110bf [API Refactor] Move out non-global require config 2016-01-13 12:41:15 -08:00
45142e03dc [API Refactor] Move uuid dependency out of top-level 2016-01-13 12:33:22 -08:00
3f26be885e [Creation] Move uuid
...into core, since it is used by the Creation capability.
2015-11-05 15:24:57 -08:00
20cb2ff239 [Clocks/Timers] Bring in latest
Merge in latest from master branch to support review of
changes, nasa/openmctweb#207
2015-10-26 10:42:41 -07:00
3d996ac466 [RequireJS] Specify path for uuid
Specify path for uuid, making it available for any code that would require it,
without that code needing to know the path to it.

Fixes https://github.com/nasa/openmctweb/issues/211.
2015-10-23 16:32:05 -07:00
8acf01ebdf [Tests] Declare deps for moment-duration-format
...in karma test runners.
2015-10-23 16:03:57 -07:00
60cdc0eb6d [Licensing] Add license header to applicable files 2015-07-24 17:08:29 -07:00
ee34b74ca1 [Style] Test config is JSLint approved 2015-07-24 16:21:15 -07:00
e7e79f41a7 [Packaging] Create NPM Package
Create NPM package for OpenMCTWeb.  Includes scripts
for hosting, running tests, and building documentation.
2015-07-21 14:29:07 -07:00