82261dfabc
[Build] Add bower.json
...
...to declare front-end dependencies, to allow these to be
removed from repository.
2016-01-28 10:51:52 -08:00
fc7bd36dba
[Build] Begin integrating compass
...
Convert SCSS to CSS as a build step.
2016-01-28 10:36:01 -08:00
918c667496
[Build] Update code coverage report path
2016-01-27 15:00:59 -08:00
97c69799b4
[Build] Use spaces instead of tabs
2016-01-27 14:30:40 -08:00
406fdd5efc
[Build] Run karma tests from gulp
2016-01-27 14:30:07 -08:00
f334be8f23
[Build] Externalize source maps
2016-01-27 14:01:09 -08:00
e1b7f2af30
[Build] Add initial gulp task
...
Add initial gulp task (r.js optimization)
2016-01-27 13:23:17 -08:00
ad63b9ff1b
[Build] Ignore dist
2016-01-27 13:03:08 -08:00
e83b19c84b
[Build] Add gulp dependency
...
Add dependency on gulp to begin modifying build, per
#460
2016-01-27 13:00:20 -08:00
be7827d6f8
Merge remote-tracking branch 'open/open445' into open-master
2016-01-22 11:47:05 -08:00
b8b5fdcabf
[Copy] #497 Removed extraenuous persist call
2016-01-22 11:32:20 -08:00
45276183b9
Merge pull request #496 from nasa/open492
...
[Documentation] #492 Amended CircleCI configuration to add missing dependency
2016-01-22 09:30:27 -08:00
3850db268a
[Documentation] #492 Added missing dependency for CircleCI
2016-01-21 10:54:49 -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
442229fd42
Merge branch 'master' of https://github.com/nasa/openmctweb into open445
...
Conflicts:
platform/features/plot/res/templates/plot.html
2016-01-13 16:01:02 -08:00
a7a707595c
[Frontend] Fixes to CSS for Chrome Linux
...
open #445
Mods and simplifications to wait-spinner classes;
Simplification and cleanup in plot.html to use loading
class instead of hide/show DOM element;
2016-01-13 13:54:00 -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
