ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 06:27:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,395 Commits 989 Branches 212 Tags 191 MiB
84e1e87ce3
Commit Graph

3395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
akhenry
88f8925d17 Merge pull request #469 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 #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
Victor Woeltjen
388cab8d32 Merge pull request #476 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 #473 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 #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
Charles Hacskaylo
c57cb43462 [Frontend] Fixed z-index of .primary-pane 
open #470
(cherry picked from commit 6bdcce0)
 2016-01-11 15:19:23 -08:00
Charles Hacskaylo
acb2a2da12 Merge master into nem468a - picking up missed files 2016-01-11 13:30:56 -08:00
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
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
Victor Woeltjen
ed454df97d [API Refactor] Uncomment out erroneous change 2016-01-08 15:45:30 -08:00
Victor Woeltjen
2665e55e59 [API Refactor] Include top-level main.js 
...in Maven-based build.
 2016-01-08 15:37:46 -08:00
Victor Woeltjen
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
Victor Woeltjen
cec197f888 [API Refactor] Remove bundle.json files 2016-01-08 15:32:18 -08:00
Victor Woeltjen
cacc295524 [API Refactor] Move rebundle script 
...out of top-level, into a scripts directory.
 2016-01-08 15:29:58 -08:00
Victor Woeltjen
3bf2819c07 [API Refactor] Ignore target when linting 2016-01-08 15:04:54 -08:00
Victor Woeltjen
ed63e326fe [API Refactor] Update documentation 
...to reflect new manner in which tests are run.
 2016-01-08 14:55:37 -08:00
Victor Woeltjen
77e39f2882 [API Refactor] Test legacy bundle registry 2016-01-08 13:38:28 -08:00
Victor Woeltjen
df631ba40e [API Refactor] Update failing specs 2016-01-08 12:58:06 -08:00
Victor Woeltjen
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
Victor Woeltjen
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
Victor Woeltjen
82094477a3 [API] Run npm tests during maven build 2016-01-08 12:10:42 -08:00
Victor Woeltjen
39c1a885d8 [API] Enable code coverage 
Enable code coverage reporting from npm-executed tests.
 2016-01-08 12:06:12 -08:00
Victor Woeltjen
72c721b605 [API] Remove bundles.json 
...and make its usage optional.
 2016-01-08 09:54:02 -08:00
Victor Woeltjen
1443ab61e3 [API] Obey strict DI from FormController 2016-01-08 09:42:38 -08:00
Victor Woeltjen
2b4d6c111c [API] Fix logging of paths 
When extensions have an explicitly-declared implementation,
do not log that they are being loaded.
 2016-01-07 16:06:04 -08:00
Victor Woeltjen
7728d308f2 [API] Obey strict DI rules 
Fix unintended implicit DI usage in  configuration
 2016-01-07 16:03:36 -08:00
Victor Woeltjen
9babe7167e [API] Enable strict DI 
...to facilitate detection of any issues with
optimizability of legacy support for imperative
registration.
 2016-01-07 15:56:09 -08:00
Victor Woeltjen
52579fefe1 [API] Simplify RequireJS config 2016-01-07 15:29:19 -08:00
Victor Woeltjen
de53247d56 [API] Convert JSON bundles to imperative form 2016-01-07 15:08:08 -08:00
Victor Woeltjen
786f9febe4 [API] Declare libs upfront 
Declare external dependencies up-front in RequireJS
config; avoids problems due to changes in ordering
(since RequireJS config may be modified by bundle
contents.)
 2016-01-07 15:07:25 -08:00
Victor Woeltjen
29acbfdb9c [API] Ensure uniqueness of impls when rebundling 
Avoids redundant argument names in generated JS files.
 2016-01-07 15:06:30 -08:00
Victor Woeltjen
5bbbdd4e50 [API] Fix explicit implementation assignments 2016-01-07 15:01:57 -08:00
Victor Woeltjen
4ed1836ae5 [API] Allow implementations to be passed directly 
Allow implementations to be passed in as values,
instead of strings, facilitating the loading of
said implementations via RequireJS.
 2016-01-07 15:01:39 -08:00
Victor Woeltjen
82990152d7 [API] Depend on bundles via AMD 2016-01-07 15:01:28 -08:00
Victor Woeltjen
8d3aec02d6 [API] Include dependencies during rebundling 2016-01-07 15:00:51 -08:00
Victor Woeltjen
792fda48e3 [API] Fix whitespace of bundle rewrites 2016-01-07 10:45:00 -08:00
Victor Woeltjen
9ebafa157b [API] Add temporary bundle-rewriting script 2016-01-07 10:42:08 -08:00
Victor Woeltjen
612dd7db2c [API] Expose browse through legacy registry 2016-01-06 17:54:56 -08:00
Victor Woeltjen
b87dd5def6 [API] Fix paths for legacyRegistry 2016-01-06 17:50:05 -08:00
akhenry
9cc03123b1 Merge pull request #402 from nasa/open209 
[Clocks/Timers] Update code style
 2016-01-06 14:07:15 -08:00
Henry
a6ecda9cab Resolved conflict 2016-01-06 14:06:28 -08:00
Henry
b20488e77d Merged conflict 2016-01-06 14:05:40 -08:00
akhenry
05a909f66f Merge pull request #451 from nasa/open116 
[Time Conductor] Improve test coverage
 2016-01-06 13:26:33 -08:00
Victor Woeltjen
2436c32e6d [Time Conductor] Split test cases 
Verify table structure separately from table contents
per code review feedback,
https://github.com/nasa/openmctweb/pull/451/files#r48999214
 2016-01-06 13:00:16 -08:00
Victor Woeltjen
a39e8e44f0 [API] Load bundles from imperative registry 2016-01-06 11:22:44 -08:00