Commit Graph

3369 Commits

Author SHA1 Message Date
54653f3914 [Create] #491 Locator is not visible when creating a new object where selected object does not have location
Added additional test for default context

Fixed JSLint error
2016-01-21 16:35:18 -08:00
fcae3fd7a9 Merge pull request #487 from nasa/open486
Review and integrate open486
2016-01-19 11:38:50 -08:00
83dd23cd4b Merge pull request #490 from nasa/nem-build-fixes
NEM build fixes
2016-01-19 11:37:25 -08:00
26c155da3b Merge branch 'open483' into open-master 2016-01-18 14:09:30 -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
6fc028e112 [Docs] remove dependencies for building docs
Remove depencendies necessary to build docs from package.json and
specify them in the readme.  Due to difficulty managing dependencies
for nomnoml on different platforms, this reduces dependency requirements
to only those needed for building the package.
2016-01-18 13:54:33 -08:00
2d44cf78f9 [Frontend] Fixed HTML and CSS for grid-item
open #486
Normalized grid-item to use similar HTML structure
as label template;
Fixed CSS accordingly.
2016-01-15 15:33:10 -08:00
0dc715199d [Build] Include examples in build 2016-01-15 11:44:26 -08:00
aab53c4ae1 [Build] Exclude target from build 2016-01-15 11:41:50 -08:00
b63812111d [Build] Include bundle.js files
https://github.com/nasa/openmctweb/issues/483
2016-01-15 11:34:58 -08:00
193c7e3db2 [New Edit Mode] Fixed failing Time Conductor Test 2016-01-14 19:57:06 -08:00
a023b0e19c Fixed failing MCTToolbarSpec 2016-01-14 19:22:33 -08:00
66e827de2e Fixed Outstanding issues from merge 2016-01-14 18:51:53 -08:00
7a563b80ee Fixing bundle load issues 2016-01-14 17:32:59 -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
3f5a8cb2be [New Edit Mode] Disabled time conductor tests which are failing 2016-01-14 16:12:44 -08:00
f300b99b7b [New Edit Mode] Code style fixes
JSLint error
2016-01-14 15:55:02 -08:00
d78bd9fd51 Merged from master 2016-01-14 15:16:02 -08:00
b4448020e4 JSLint 2016-01-14 15:12:15 -08:00
0741e2cf5e Disabled failing tests 2016-01-14 15:11:19 -08:00
6d3b2c716b JSLint 2016-01-14 15:05:26 -08:00
858aa6146a JSLint 2016-01-14 15:04:13 -08:00
826d39a749 [New Edit Mode] Fixed logic in EditActionPolicy to use positive logic 2016-01-14 15:02:22 -08:00
77efda2c11 [New Edit Mode] JSLint 2016-01-14 14:44:19 -08:00
cb866bce33 [New Edit Mode] Removed test bypass from circle CI deployment descriptor 2016-01-14 14:21:32 -08:00
88f8925d17 Merge pull request #469 from nasa/open450b
[API Refactor] Imperatively register bundles
2016-01-14 09:41:04 -08:00
388cab8d32 Merge pull request #476 from nasa/open342
Review and integrate open342
2016-01-13 12:46:41 -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
86daad5fbd [API Refactor] Remove obsolete UUID dependency
...in association with cleanup of requirejs config,
https://github.com/nasa/openmctweb/pull/469/files#r49642503
2016-01-13 12:22:44 -08:00
d1e5ca7875 Merge pull request #473 from nasa/nem470_prototype
Review and integrate nem470_prototype
2016-01-13 09:04:41 -08:00
8dd36d426c [Frontend] Refactoring local controls hide and show
open #342
Now using CSS hover on pertinent plot areas;
Refining of select styling, tweaks for Firefox Linux;
Tweaks to local-control positioning in plots;
Changed *-options controls to use length > 1
instead of > 0;
2016-01-12 15:54:56 -08:00
c57cb43462 [Frontend] Fixed z-index of .primary-pane
open #470
(cherry picked from commit 6bdcce0)
2016-01-11 15:19:23 -08:00
acb2a2da12 Merge master into nem468a - picking up missed files 2016-01-11 13:30:56 -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
a65ca7cb1e [Frontend] Refactor Inspector to use s-status-editing
open #468
Removed ng-show="editMode" in object-inspector.html;
Refactored CSS as required in _inspector.scss;
Added opacity transition to splitter-inspect-panel and
split-pane-component pane bottom, but not working as desired currently:
entire inspector seems to be destroyed and recreated when switching into
and out of edit mode;
Moved <style> def for .location-item in object-inspector.html into .scss;
2016-01-08 16:47:11 -08:00
898dd557e5 [Frontend] Refactor to use s-status-editing instead of ng-class
open #468
Remove ng-class statements in favor of upstream .s-status-editing;
Restructure CSS accordingly;
NOTE: because edit.html has NOT been changed,
changes here will cause old edit mode to no longer display properly.
Don't integrate this CSS with old edit mode!
2016-01-08 16:11:00 -08:00
ed454df97d [API Refactor] Uncomment out erroneous change 2016-01-08 15:45:30 -08:00
2665e55e59 [API Refactor] Include top-level main.js
...in Maven-based build.
2016-01-08 15:37:46 -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
cacc295524 [API Refactor] Move rebundle script
...out of top-level, into a scripts directory.
2016-01-08 15:29:58 -08:00
3bf2819c07 [API Refactor] Ignore target when linting 2016-01-08 15:04:54 -08:00
ed63e326fe [API Refactor] Update documentation
...to reflect new manner in which tests are run.
2016-01-08 14:55:37 -08:00
77e39f2882 [API Refactor] Test legacy bundle registry 2016-01-08 13:38:28 -08:00
df631ba40e [API Refactor] Update failing specs 2016-01-08 12:58:06 -08:00
65c0cc66b6 [API Refactor] Add HTML reporting
Write HTML reports of test successes/failures to simplify
handling of test failures; pre-existing HTML test runner
is incompatible with changes to the way bundles are loaded.
2016-01-08 12:57:22 -08:00
aa63308e0b [API Refactor] Fix JSLint failures
Fix JSLint failures by excluding top-level code,
and by explicitly declaring variable require.
2016-01-08 12:36:48 -08:00
82094477a3 [API] Run npm tests during maven build 2016-01-08 12:10:42 -08:00