Commit Graph

3386 Commits

Author SHA1 Message Date
Victor Woeltjen
b5c8ecc85f Merge pull request from nasa/open325b
[Time Conductor] Update validation logic
2016-01-27 12:44:14 -08:00
Victor Woeltjen
9e6da94878 [Time Conductor] Reformat expression in template
...to use less line width, and to exhibit more normal
indentation, per code review feedback from 
2016-01-22 15:24:27 -08:00
Victor Woeltjen
3a26c864b8 [Time Conductor] Fix comment text
Per code review feedback, 
2016-01-22 15:22:54 -08:00
Pete Richards
be7827d6f8 Merge remote-tracking branch 'open/open445' into open-master 2016-01-22 11:47:05 -08:00
Henry
b8b5fdcabf [Copy] Removed extraenuous persist call 2016-01-22 11:32:20 -08:00
Victor Woeltjen ★
45276183b9 Merge pull request from nasa/open492
[Documentation]  Amended CircleCI configuration to add missing dependency
2016-01-22 09:30:27 -08:00
Henry
3850db268a [Documentation] Added missing dependency for CircleCI 2016-01-21 10:54:49 -08:00
Victor Woeltjen ★
fcae3fd7a9 Merge pull request from nasa/open486
Review and integrate open486
2016-01-19 11:38:50 -08:00
Victor Woeltjen ★
83dd23cd4b Merge pull request from nasa/nem-build-fixes
NEM build fixes
2016-01-19 11:37:25 -08:00
Pete Richards
26c155da3b Merge branch 'open483' into open-master 2016-01-18 14:09:30 -08:00
Pete Richards
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
Pete Richards
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
Charles Hacskaylo
2d44cf78f9 [Frontend] Fixed HTML and CSS for grid-item
open 
Normalized grid-item to use similar HTML structure
as label template;
Fixed CSS accordingly.
2016-01-15 15:33:10 -08:00
Victor Woeltjen
0dc715199d [Build] Include examples in build 2016-01-15 11:44:26 -08:00
Victor Woeltjen
aab53c4ae1 [Build] Exclude target from build 2016-01-15 11:41:50 -08:00
Victor Woeltjen
b63812111d [Build] Include bundle.js files
https://github.com/nasa/openmctweb/issues/483
2016-01-15 11:34:58 -08:00
Henry
193c7e3db2 [New Edit Mode] Fixed failing Time Conductor Test 2016-01-14 19:57:06 -08:00
Henry
a023b0e19c Fixed failing MCTToolbarSpec 2016-01-14 19:22:33 -08:00
Henry
66e827de2e Fixed Outstanding issues from merge 2016-01-14 18:51:53 -08:00
Henry
7a563b80ee Fixing bundle load issues 2016-01-14 17:32:59 -08:00
Henry
032b2542f0 Merged from Master 2016-01-14 17:23:53 -08:00
Henry
3e7eb11d84 Regenerated bundles 2016-01-14 17:08:19 -08:00
Henry
3f5a8cb2be [New Edit Mode] Disabled time conductor tests which are failing 2016-01-14 16:12:44 -08:00
Henry
f300b99b7b [New Edit Mode] Code style fixes
JSLint error
2016-01-14 15:55:02 -08:00
Henry
d78bd9fd51 Merged from master 2016-01-14 15:16:02 -08:00
Henry
b4448020e4 JSLint 2016-01-14 15:12:15 -08:00
Henry
0741e2cf5e Disabled failing tests 2016-01-14 15:11:19 -08:00
Henry
6d3b2c716b JSLint 2016-01-14 15:05:26 -08:00
Henry
858aa6146a JSLint 2016-01-14 15:04:13 -08:00
Henry
826d39a749 [New Edit Mode] Fixed logic in EditActionPolicy to use positive logic 2016-01-14 15:02:22 -08:00
Henry
77efda2c11 [New Edit Mode] JSLint 2016-01-14 14:44:19 -08:00
Henry
cb866bce33 [New Edit Mode] Removed test bypass from circle CI deployment descriptor 2016-01-14 14:21:32 -08:00
akhenry
88f8925d17 Merge pull request from nasa/open450b
[API Refactor] Imperatively register bundles
2016-01-14 09:41:04 -08:00
Charles Hacskaylo
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
Charles Hacskaylo
a7a707595c [Frontend] Fixes to CSS for Chrome Linux
open 
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
Victor Woeltjen
388cab8d32 Merge pull request from nasa/open342
Review and integrate open342
2016-01-13 12:46:41 -08:00
Victor Woeltjen
69c5b110bf [API Refactor] Move out non-global require config 2016-01-13 12:41:15 -08:00
Victor Woeltjen
45142e03dc [API Refactor] Move uuid dependency out of top-level 2016-01-13 12:33:22 -08:00
Victor Woeltjen
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
akhenry
d1e5ca7875 Merge pull request from nasa/nem470_prototype
Review and integrate nem470_prototype
2016-01-13 09:04:41 -08:00
Charles Hacskaylo
8dd36d426c [Frontend] Refactoring local controls hide and show
open 
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
Victor Woeltjen
9fe026a1f1 [Time Conductor] Decrease minimum outer span 2016-01-11 18:29:42 -08:00
Victor Woeltjen
3b5c1bf2e6 [Time Conductor] Update spec
Verify that validation occurs against state in formModel;
remove obsolete test case for enforcing minimum outer span
2016-01-11 18:28:44 -08:00
Victor Woeltjen
bb993dc94f [Time Conductor] Don't update invalid bounds
Don't enforce minimum time span when bounds are invalid;
https://github.com/nasa/openmctweb/issues/325#issuecomment-170755787
2016-01-11 18:23:32 -08:00
Victor Woeltjen
5beb1de805 [Time Conductor] Display validation errors consistently 2016-01-11 16:56:58 -08:00
Victor Woeltjen
0a012c67dd [Time Conductor] Test additions to TimeRangeController
Add test cases to cover validators added to display
start/end time violations.
2016-01-11 16:41:20 -08:00
Victor Woeltjen
11b71fae68 [Time Conductor] Display invalid state
...when text value can be parsed in a date-time field,
but numeric value violates externally-imposed validation
2016-01-11 15:29:43 -08:00
Victor Woeltjen
e6d0537e5e Revert "[Time Conductor] Validate numeric date-time fields"
This reverts commit 07c407edea.
2016-01-11 15:23:21 -08:00
Charles Hacskaylo
c57cb43462 [Frontend] Fixed z-index of .primary-pane
open 
(cherry picked from commit 6bdcce0)
2016-01-11 15:19:23 -08:00
Victor Woeltjen
99556ed6a5 [Time Conductor] Validate start/end times 2016-01-11 15:18:38 -08:00