ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-23 15:02:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,788 Commits 989 Branches 212 Tags 191 MiB
0643fb1f3f
Commit Graph

3788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Woeltjen
70ed16491a [Templates] Change watch order 
...to work around order-sensitive test case
 2016-02-26 16:26:31 -08:00
Victor Woeltjen
7240ff4f8d [Templates] Update mct-control spec 
...to reflect usage of templateLinker, to support including
templates via RequireJS text plugin
 2016-02-26 16:22:55 -08:00
Victor Woeltjen
3a6e0be2d7 [Templates] Update FixedController spec 
...to reflect changes to how selection object is obtained,
which in turn reflects change to using templates obtained
via RequireJS text plugin, instead of loading by URL.
 2016-02-26 16:19:14 -08:00
Victor Woeltjen
9b21b0b7f2 [Templates] Update mct-container spec 
...to reflect change to template over templateUrl
 2016-02-26 16:17:33 -08:00
Victor Woeltjen
164c2faf07 Merge branch 'master' into open673 
Merge latest from master into topic branch for #673
 2016-02-26 15:54:41 -08:00
Victor Woeltjen
894cf5c461 [Templates] Include templates in test configuration 
...such that they are available to the RequireJS text plugin
for loading.
 2016-02-26 15:53:35 -08:00
Victor Woeltjen
fe419714f5 [Templates] Check for availability of timespan 
...as ordering changes due to change from templateUrl to template
may mean this is not available when first initialized.
 2016-02-26 15:50:07 -08:00
Victor Woeltjen
f3fd2e67fc [Templates] Watch for selection object 
...from Timeline, to ensure toolbar appears etc.
Reflects changes to ordering triggered by use of
template instead of templateUrl
 2016-02-26 15:49:21 -08:00
Victor Woeltjen
931fa77cbe [Templates] Handle deferred selection availability 
Loading templates via RequireJS text plugin means they are
immediately available; appears to have caused a change in
ordering wherein controllers for views may be initialized
before representers have installed things like selection
state. As such, need to watch for changes instead of simply
checking for a selection object when the controller is
initialized.
 2016-02-26 15:37:19 -08:00
Andrew Henry
872c4021e3 Merge pull request #82 from tarikozket/patch-1 
Fixed typo
 2016-02-26 23:28:24 +00:00
Andrew Henry
26d29c3d92 Merge pull request #652 from nasa/open649 
[CSV Export] Implement exportService
 2016-02-26 23:18:12 +00:00
Victor Woeltjen
596735352a [Templates] Simplify MCTToolbar 
Use mct-form as a basis; simply change the template.
 2016-02-26 15:17:31 -08:00
Henry
402512a461 Merged from master to resolve conflict 2016-02-26 15:15:22 -08:00
Victor Woeltjen
2d03e3e6d4 [Templates] Remove unused template path calculation 2016-02-26 15:03:45 -08:00
Victor Woeltjen
19b442cc0b [Templates] Require data table templates 
...via text plugin
 2016-02-26 15:02:04 -08:00
Victor Woeltjen
5c3d8508a2 [Templates] Use templateLinker for forms 
...for compatibility with both template and templateUrl
 2016-02-26 15:01:40 -08:00
Victor Woeltjen
8581547a9c [Templates] Allow only template property for containers 
...to work around difficulties with transclusion using
templateLinker.
 2016-02-26 14:49:55 -08:00
Charles Hacskaylo
192bbae6e5 [Frontend] Fix paths, includes 
#702
Per https://github.com/nasa/openmctweb/pull/702;
Removed include of _logo-and-bg.scss into _about.scss;
 2016-02-26 14:49:34 -08:00
Victor Woeltjen
e61711688e [Templates] Use templateLinker from MCTContainer 
...for compatibility with both template and templateUrl.
 2016-02-26 14:24:41 -08:00
Victor Woeltjen
a73f1ebbbd Merge pull request #637 from nasa/rems_data 
[Examples] Rems data integration
 2016-02-26 14:21:30 -08:00
Henry
4674918b4b [Examples] #359 Updated to attempt connection to remote data source and fallback to local if unavailable 
Minor change to readme

Fixed JSLint errors

More JSLint errors

[Example] Rems data integration - disabled bundle by default.

[Examples] REMS data integration - added newlines at end of files

[Example] Added time conductor support to REMS data integration

Added caching of results

[Examples] Added domain format to REMS data #359

[Example] #637 Added local proxy to app.js to allow cross-origin requests

Updated readme
 2016-02-26 14:03:10 -08:00
Victor Woeltjen
741d4476e6 [Templates] Use text plugin for toolbar 2016-02-26 13:12:35 -08:00
Victor Woeltjen
bf1fa0ac4c [Templates] Include templates using text plugin 
Resolves #673
 2016-02-26 13:07:50 -08:00
Victor Woeltjen
60efdb4ad3 [Templates] Add in-place rewrite step 2016-02-26 13:07:32 -08:00
Victor Woeltjen
8ea56486c5 [Templates] Normalize spacing 2016-02-26 13:03:06 -08:00
Victor Woeltjen
e13e068b6e [Templates] Begin teplacing templateUrl properties 2016-02-26 13:00:50 -08:00
Victor Woeltjen
852faf061e [Templates] Add parameter names for required templates 2016-02-26 12:52:02 -08:00
Victor Woeltjen
f2e4b01721 [Templates] Add template paths 
...with text! prefix
 2016-02-26 12:50:28 -08:00
Victor Woeltjen
930fed83e8 [Templates] Create variable names by template URL 2016-02-26 12:17:57 -08:00
Victor Woeltjen
4666292907 [Templates] Begin writing migration script 
...to rewrite bundle.js files to load templates via
the RequireJS text plugin. #673
 2016-02-26 12:12:13 -08:00
Henry
f04c3692c1 [Table] #670 Name column only prepended if multiple objects 2016-02-26 11:22:16 -08:00
Henry
ffa497f22f [Table] #670 Added new view type 'table' 2016-02-26 11:09:51 -08:00
Victor Woeltjen
0068348bb2 Merge pull request #704 from nasa/open703 
[Examples] #703 Changed imagery telemetry metadata to use 'utc' format
 2016-02-26 11:00:26 -08:00
Charles Hacskaylo
bc3eb4ab8d [Frontend] New logo art 
#164
New logo art for Open MCT added;
Removed console.log;
 2016-02-26 10:59:54 -08:00
Charles Hacskaylo
d203f3adc0 [Frontend] New logo art; paths changed 
#164
Per comments in #702, abs paths changed
to relative;
New logo art for Open MCT added;
CSS tweaked as needed;
 2016-02-26 10:15:15 -08:00
Henry
5e7eb7e87e [Examples] #703 Changed imagery telemetry metadata to use 'utc' format for time 2016-02-26 09:32:03 -08:00
Charles Hacskaylo
1a2a2e66ca [Frontend] Removed commented styling 
open #164
 2016-02-25 12:41:54 -08:00
Charles Hacskaylo
129b554f9d [Frontend] Significant markup/CSS mods for splash screen 
#164
https://github.jpl.nasa.gov/MissionControl/vista/issues/299
App logo and bg files renamed;
Added openmct.scss to hold openmct-specific styles;
Renamed _startup.scss to startup-base.scss
which now renders its own .css file;

Still to-do: apply to WARP including needed
mods to its About dialog screen;
 2016-02-24 17:47:24 -08:00
Charles Hacskaylo
164d959f60 [Frontend] Significant markup/CSS mods for splash screen 
#164
Markup in index.html and about-dialog.html
changed to simplify and use :before/:after psuedos;
CSS in _logo-and-bg.scss modded for same;
Added _startup.scss to hold general CSS for
the startup screen;
Renamed startup.scss to startup-open.scss;
Modified SplashScreenManager.js to target renamed
outer container .l-splash-holder;
Added media query for startup screen on phone;
Cleanup: moved classes out of _effects into _global;
Still to-do: apply to WARP and VISTA, including needed
mods to their About dialog screens;
 2016-02-23 18:30:21 -08:00
Charles Hacskaylo
99cf690ad4 Merge branch 'master' into open164 2016-02-23 16:03:24 -08:00
Henry
aabeb72203 [Plots] #638 Fixed failing test 2016-02-23 15:22:21 -08:00
Pete Richards
fcdf89a4ee Merge branch 'master' into open638_rebase 2016-02-23 10:56:13 -08:00
Pete Richards
77a2e0a70b Merge branch 'master' into open639 2016-02-23 10:46:33 -08:00
Victor Woeltjen
f379db55e7 Merge pull request #699 from nasa/remove-compass 
Remove compass, add bourbon
 2016-02-23 10:00:01 -08:00
Pete Richards
51fbbfe601 [Gulp] Revert accidental change 2016-02-22 19:07:36 -08:00
Pete Richards
eaab70741a [Build] Generate CSS sourcemaps 
Generate CSS sourcemaps to aide in debugging.

https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:57:05 -08:00
Pete Richards
a05d6d8ee8 [Build] Rebuild scss when starting server 
Rebuild scss when starting the development server.

https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:30:07 -08:00
Pete Richards
88945c48d4 [Build] Gracefully handle sass error 
https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:29:26 -08:00
Pete Richards
bd7ad85bd7 [Build] Remove unused dependency 
https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:28:45 -08:00
Pete Richards
9b3c8dce25 [SCSS] Remove old references to compass 
Remove any old references to compass.

https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:22:44 -08:00