ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-09 06:22:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,592 Commits 992 Branches 212 Tags 192 MiB
9b21b0b7f2
Commit Graph

3592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Henry
5e7eb7e87e [Examples] #703 Changed imagery telemetry metadata to use 'utc' format for time 2016-02-26 09:32:03 -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
Pete Richards
4d800d26e2 [CSS] Add reset to replace compass/reset 
Add reset.css which replaces compass/reset.

https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:18:06 -08:00
Pete Richards
0a71835687 [Build] Switch compass to bourbon 
Change mixin library to bourbon.  Significantly reduces sass build time.

https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:02:16 -08:00
Victor Woeltjen
87934df0d5 Merge pull request #697 from nasa/handle-scss-errors 
[Build] Gracefully handle scss errors
 2016-02-22 15:34:59 -08:00
Pete Richards
db1a7e37e8 [Build] Gracefully handle scss errors 
Log errors in SCSS processing but don't crash watch process.

Fixes https://github.com/nasa/openmctweb/issues/696
 2016-02-22 15:29:00 -08:00
Pete Richards
b5c88e5c5c Merge pull request #695 from nasa/open442 
Review and integrate open442
 2016-02-22 13:43:59 -08:00
Victor Woeltjen
5d8efebc55 Merge pull request #694 from nasa/fix-watch 
[Build] reinstantiate compass per task execution
 2016-02-22 12:54:29 -08:00
Charles Hacskaylo
729d91e7f3 [Frontend] CSS sanding and shimming 
open #442
Fixed white space problem with .status-block-holder
applied to mct-include; Added new status 'available'
class and updated theme constants files;
 2016-02-22 12:51:32 -08:00
Pete Richards
34b0b55b97 [Build] reinstantiate compass per task execution 
Reinstantiate compass wrapper for each task execution.  Allows stylesheets
task to be run multiple times by watch.  Fixes a bug that prevents watch
from working properly.
 2016-02-22 12:45:41 -08:00
Charles Hacskaylo
bd0867b79d Merge branch 'master' into open442 
Conflicts:
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
 2016-02-22 11:11:32 -08:00
Victor Woeltjen
6d036a5d67 Merge pull request #693 from nasa/build-css 
[Build] Add stylesheets to build
 2016-02-22 10:59:46 -08:00
Pete Richards
c0168088a1 Merge pull request #692 from nasa/prod-uisymbols 
Integrate new VISTA Topic and Session glyphs
 2016-02-22 10:58:24 -08:00
Pete Richards
5f81e95c87 [Build] Add Gemfile, use bundle exec 
Add a Gemfile to specify ruby dependencies and update gulp-compass to use
bundle exec to execute compass.

Addresses comments in https://github.com/nasa/openmctweb/pull/693
 2016-02-22 10:37:30 -08:00
Charles Hacskaylo
ebf501ce71 [Frontend] Markup and CSS related to indicators; hover styles 
open #442
https://github.jpl.nasa.gov/MissionControl/vista/issues/293

s-btn hover styling cleaned up;
Spacing, styles, etc. for indicators refined;
Constants, colors added to, cleaned up and normalized;
Animation code in _effects refactored;
 2016-02-19 17:59:32 -08:00
Pete Richards
ed09214f59 [Build] Save stylesheets to proper location 
Updates the stylesheet task to output CSS in the correct locations. Remove
config.rb for running compass manually, and remove compiled css files from
project.  Add a .gitignore to ensure they don't get included accidentally.

Add a gulp task for running the development server and watching for scss
changes at the same time.

resolves https://github.com/nasa/openmctweb/issues/238
 2016-02-19 13:26:20 -08:00