ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-19 05:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,676 Commits 989 Branches 212 Tags 191 MiB
d4b15525ca
Commit Graph

3676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Hacskaylo
31a983966b [Frontend] In-progress on adding branded per-app screens 
open #164
CSS, markup;
 2016-02-22 15:44:57 -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
Victor Woeltjen
d3e274bfdd Merge branch 'master' into open401 
Resolve conflicts for #416

Conflicts:
	platform/commonUI/browse/bundle.json
	platform/commonUI/browse/src/BrowseController.js
 2016-02-22 14:27:21 -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
Charles Hacskaylo
b0b2db24e0 [Frontend] Mods to .status.block 
open #442
Added clickable class; tweaks to indicator.html
to introduce s-btn element look;
 2016-02-18 18:03:43 -08:00
Charles Hacskaylo
a2f8f4334f Updated font to include new VISTA session and topic glyphs 2016-02-18 16:42:56 -08:00
Charles Hacskaylo
626cc502fb [Frontend] Removed -moz-osx-font-smoothing property 
open #687
 2016-02-18 13:24:06 -08:00
Charles Hacskaylo
95f1768fb7 [Frontend] Refactoring to use Victorizr instead of media queries 
open #639
open #683
open #169
Tweak to espresso tree view control color and hover color
for espresso theme; reordered elements in _constants;
 2016-02-18 13:10:54 -08:00
Charles Hacskaylo
fb20af24bc [Frontend] Refactoring to use Victorizr instead of media queries 
open #639
open #683
open #169
open #335
    Fixed wrong application of body.desktop.mini-tab...;
    Increased size of pane collapse/expand icons;
    Removed max-width applied to search input holder;
 2016-02-18 11:25:12 -08:00
Charles Hacskaylo
f6cb76354e [Frontend] Refactoring to use Victorizr instead of media queries 
open #639
open #683
open #169
MQs refactored in mobile/_layout.scss;
 2016-02-17 16:34:33 -08:00
Charles Hacskaylo
66905cbcbb [Frontend] Refactoring to use Victorizr instead of media queries 
open #639
open #683
open #169
open #494
Replaced MQ around mobile/_tree.scss ul.tree;
Removed MQ desktop around hover in mixin btnBase;
Reversed orientation of mobile tree arrows for #494;
 2016-02-17 16:12:18 -08:00
Charles Hacskaylo
a4f24adb8a [Frontend] Refactoring to use Victorizr instead of media queries 
open #639
Replaced MQ around _controls webkit-scrollbar CSS;
 2016-02-17 10:26:42 -08:00
Charles Hacskaylo
242e02e9af Added compass_scripts directory 
open #639
Added dir to .gitignore
 2016-02-17 10:20:58 -08:00
Charles Hacskaylo
0ddaa52a8a [Frontend] Refactor CSS to not use 'desktop' media query 
open #639
Refactored all usage of @include desktop to use CSS selector body.desktop
instead; Still to-do: deal with desktopandtablet usage with hover bubbles
and mixins btnBase;
 2016-02-16 18:38:06 -08:00
Pete Richards
6fee4f340f [Build] Start 0.9.2-SNAPSHOT 2016-02-12 12:34:54 -08:00
Pete Richards
1eb372177d [Build] Add npmignore to allow packing 
Add .npmignore to facilitate packing of package with npm pack.
 2016-02-12 11:47:28 -08:00
Pete Richards
3de094e311 [Version] Remove snapshot for tag 
Update the version in advance of tagging a release.
 2016-02-12 11:17:11 -08:00
Melanie Lean
53c60ee64f [Timelines] #677 Applied fix to prevent editing of timelines in browse mode 
Fixed failing test
 2016-02-11 21:52:05 -08:00
Victor Woeltjen
42ce2aa7cf Merge pull request #666 from nasa/open656b 
[Create] Utilize copyService during Save As
 2016-02-11 09:55:21 -08:00
Victor Woeltjen
43d497e069 [Create] Clarify function naming 
Per review feedback,
https://github.com/nasa/openmctweb/pull/666#discussion_r52625960
 2016-02-11 09:49:26 -08:00
Henry
7d0de68db9 [Plot] #638 Changed plot series to an array 2016-02-10 20:27:04 -08:00
Victor Woeltjen
5306e96374 Merge pull request #668 from nasa/open659 
[New Edit Mode] #659 Fix to timelines
 2016-02-10 17:02:28 -08:00
Andrew Henry
156940f25b Merge pull request #667 from nasa/open659a 
Review and integrate open659a into open659
 2016-02-10 16:59:43 -08:00
Henry
10e0acddb3 [New Edit Mode] #659 Fix to prevent multi-composition with same object, fix to prevent composition of object with self 2016-02-10 16:43:08 -08:00
Charles Hacskaylo
ceee7e0da9 [Frontend] Fixed CSS issue with Timeline label elements 
open #659
CSS for .rep-object-label modified; Added CSS class
to tabular-swimlane-cols-tree.html markup;
Also cleaned up .s-status-pending styles for related
label elements;
 2016-02-10 16:38:39 -08:00
Victor Woeltjen
53a49a671b [Create] Test optional filter parameter 2016-02-10 14:31:56 -08:00
Victor Woeltjen
99a454f943 [Create] Update CopyService spec 
...to reflect API usage after #656
 2016-02-10 14:21:09 -08:00
Victor Woeltjen
cb53e1aaee [Create] Add object, not ID 
Add domain object, and not its identifier, when suing
add method of composition from CopyTask, for consistency
with test expectations.
 2016-02-10 14:17:36 -08:00
Victor Woeltjen
0f231838ec [Create] Update test inputs to CopyTask 
...to reflect changes for #656
 2016-02-10 14:05:04 -08:00
Victor Woeltjen
0bdf05e61c [Create] Always allow cloning self 
Always allow cloning the newly-created object itself
when saving a newly-created domain object.
 2016-02-10 13:49:15 -08:00
Victor Woeltjen
3146660833 [Create] Utilize filtering during clone 2016-02-10 13:46:19 -08:00
Victor Woeltjen
72df464f0f [Create] Utilize passed-in filter 
...when determining which objects should be cloned.
 2016-02-10 13:38:53 -08:00
Victor Woeltjen
f602aa9247 [Create] Add filter to copyService 
Add an optional parameter to method signature of
copyService, used to determine if a domain object should
or should not be cloned.

This will be used to support usages of copyService
where links should remain links;
https://github.com/nasa/openmctweb/pull/666/files#r52525612
 2016-02-10 13:29:56 -08:00
Victor Woeltjen
b37b82133e [Create] Return cloned object in context 
...to allow copyService to be used in the context of a
Save As action, with an appropriate navigation change.
 2016-02-10 12:23:10 -08:00
Victor Woeltjen
c43929f1c6 [Create] Add specificity to check 
Explicitly check if an object has a persistence timestamp
at all (avoids false-positives due to falsiness of zero.)
 2016-02-10 12:07:45 -08:00
Victor Woeltjen
88750d92ef [Create] Remove unused code, dependencies 2016-02-10 12:05:01 -08:00
Victor Woeltjen
8c602025d4 [Create] Avoid navigation warning 
...when navigating to a clone created via Save As.
 2016-02-10 11:59:17 -08:00
Victor Woeltjen
5604120d55 [Create] Use duplicate at end of Save 
...for unpersisted objects. Ensures that they share the
persistence space of their parent. #656.
 2016-02-10 11:42:35 -08:00
Victor Woeltjen
5daf2f54cd Merge pull request #665 from nasa/open660 
[Edit Mode] Added ability to clear all dirty cache
 2016-02-10 09:19:19 -08:00
Henry
24c750b41e [Plot] Fixed jsLint, removed onchange 
Removed ngChange from mct-control

Removed ng-change
 2016-02-09 21:19:47 -08:00