1efa97e6f5
Merge remote-tracking branch 'github/master' into open115b
...
Conflicts:
platform/features/conductor/src/ConductorRepresenter.js
2015-10-09 10:32:43 -07:00
333f7cb848
[Frontend] Time controller-related styling
...
open #1515
open #117
Markup changed to utilize mct-representation via CSS;
time-controller now uses list-based _constants values;
ConductorRepresenter.js modded to remove inline styling
and to add CSS classes to enclosing mct-representation;
2015-09-29 08:43:34 -07:00
4ced6c44a6
[Time Conductor] Ignore empty series
...
...when updating Fixed Position view.
2015-09-24 17:01:50 -07:00
0260e6fff4
Merge branch 'open1515' into open115
2015-09-23 16:05:09 -07:00
9811443c71
Merge branch 'master' into open117
2015-09-23 15:54:48 -07:00
056b0c8c5b
[Fixed Position] Use spaces instead of tabs
...
...to satisfy code style checker and pass build,
in preparation for merge. nasa/openmctweb#118
2015-09-23 12:59:04 -07:00
dbe1875e70
[Themes] Resolve conflicts
...
Resolve conflicts in preparation for merge, nasa/openmctweb#118
2015-09-22 16:12:44 -07:00
480da3476e
Merge branch 'mobile' into mobile-integration
2015-09-22 10:55:43 -07:00
65368ed0c3
[Config] Removed non-functional config options from Create dialogs;
...
open #124
Removed "Default view" and "Display title by default" from
Panel configs;
2015-09-18 13:43:29 -07:00
f28d2f19d0
[Frontend/PLATFORM] Cherry picking from platform changes in vista65
...
open #95
vista #65
scss and html mods for VISTA-related elements;
(cherry picked from commit 6ef3987)
2015-09-16 17:17:54 -07:00
190f5fd0ea
[Time Conductor] Update failing specs
...
WTD-1515
2015-09-16 15:23:08 -07:00
ad29fb0f92
[Time Conductor] Populate FP from historical
...
Populate fixed position view from historical
telemetry when first loaded. WTD-1515
2015-09-16 13:38:47 -07:00
3e5d46a62b
[Frontend] IN-PROGRESS Theme changes continuing
...
open #95
Limits, plots, etc.;
Misc sanding and shimming;
Updated symbols font to replace missing
Info symbol;
2015-09-11 16:25:19 -07:00
e3b191b5dc
[Time Controller] Update failing specs
...
Update failing specs to reflect support for time conductor,
WTD-1515
2015-09-09 16:52:46 -07:00
a4dda695dd
[Time Controller] Get conductor working with fixed pos.
...
WTD-1515
2015-09-09 16:46:00 -07:00
fdbc91131b
[Time Controller] Update bundle definition
...
...for Fixed Position view to reflect changes to dependencies,
WTD-1515.
2015-09-08 17:18:39 -07:00
d2dfec3ce7
[Time Controller] Simplify retrieval of datum objects
...
...for historical data. Supports WTD-1515
2015-09-08 17:03:58 -07:00
760f4b818f
[Time Conductor] Update fixed position from history
...
WTD-1515
2015-09-08 16:53:06 -07:00
c026bfa17d
[Time Conductor] Begin adding support to fixed position
...
Begin adding support for universal time controller to
fixed position view, WTD-1515.
2015-09-08 16:37:10 -07:00
bb1a02c8bd
[Frontend] Significant re-factoring of CSS and markup
...
open #95
IN-PROGRESS!;
Mostly buttons and menus classes (s-btn and s-menu);
Removed unused templates and .css files;
Normalized some button containers;
2015-09-02 18:02:58 -07:00
def5e17bb8
[Mobile] Merge
...
Merged open73 into mobile. Search bar is currently
covering the create button slightly.
2015-08-26 14:07:52 -07:00
e96d3e3738
[Mobile] IN PROGRESS: Significant redo of object-header
...
open #74
Added .bar .l-flex using display: flex in object header;
2015-08-24 12:22:08 -07:00
ee608cc4a4
[Mobile] IN PROGRESS: General fixes, spurred by mobile, for object-header
...
open #74
Attempting to layout using flex - not working;
See http://jsfiddle.net/charlesh88/cpf9zjts/9/ for working example;
New _flex.scss added;
This commit is changed elements that are mostly solid;
2015-08-21 15:09:23 -07:00
ed53808556
[Code Style] Use prototypes in Layout bundle
...
WTD-1482
2015-08-12 13:45:48 -07:00
31eb366e7f
[JSDoc] Add namespace docs
...
WTD-1482.
2015-08-07 12:13:15 -07:00
c08a460d30
[JSDoc] Add annotations
...
Bulk-add JSDoc annotations, WTD-1482.
2015-08-07 11:44:54 -07:00
2ca3c6ea93
[Layout] Use consistent whitespace
...
Use consistent whitespace in array literals, WTD-1424.
2015-08-04 10:00:44 -07:00
a4c704a5a2
[Layout] Ensure minimum frame size
...
Ensure default frame size in a layout is not small,
even if the grid size for the layout is very small.
WTD-1424.
2015-08-03 12:18:49 -07:00
af2ca49b23
[Frontend] Added top right resize corner
...
WTD-1404
WTD-1376
2015-06-30 09:27:56 -07:00
87f982b03e
Merge remote-tracking branch 'nasa/open-master' into open-master
2015-06-29 15:10:02 -07:00
29283e4fb5
Merge branch 'open1233' into open-master
2015-06-29 15:09:40 -07:00
cc64412d78
Merge remote-tracking branch 'origin/open1344' into open-1348
2015-06-29 14:58:27 -07:00
ebbac233aa
Merge branch 'open1373' into open-master
2015-06-29 13:15:43 -07:00
38ad8058e8
Merge remote-tracking branch 'origin/open1223' into open-1338
...
Resolve merge conflicts due to whitespace changes.
2015-06-29 12:08:16 -07:00
84345caf7d
[Style] Convert tabs to spaces
2015-06-29 11:51:28 -07:00
762f4d59fc
[Layout] Disallow folders
...
Disallow layouts in folders, WTD-1373.
2015-06-27 12:43:32 -07:00
286ac5628b
[Drag-Drop] Check for default prevented correctly
...
Check for defaultPrevented property instead of trying
to check nonexistent method isDefaultPrevented(); for
WTD-1354 in the context of WTD-1233.
2015-06-26 11:53:45 -07:00
f681d07643
Merge branch 'open-master' into open1233
2015-06-26 11:50:48 -07:00
685e384858
[Dev/Frontend] PLATFORM CHANGES: use data-value instead of css class selection
...
WTD-1341
(cherry picked from commit 5151637 in warp1341)
telemetry.html now uses data-value instead of class;
Mods to effects.scss to add customKeyframes mixin;
Added default transition time to mixin trans-prop-nice in mixins.scss;
2015-06-25 11:46:15 -07:00
61fe77cc17
[Drag-Drop] Add test cases
...
Add test cases for avoiding redundant drop handling,
WTD-1233.
2015-06-25 11:35:18 -07:00
6f3d6ec12f
[Drag-Drop] Prevent redundant drops
...
Mark default as prevented and check for prevention of
default when handling mctDrop events (which allow
views to follow up on drop gestures by positioning
objects within themselves) avoiding redundant drops
into embedded views. WTD-1233.
2015-06-25 11:27:58 -07:00
482f355a08
[Fixed Controller] Stop tracking bounds
...
Stop tracking size of a fixed position view; no longer
necessary now that background grid is handled by CSS.
Change made in the context of WTD-1344.
2015-06-25 11:00:15 -07:00
9e55befb2a
[Fixed Controller] Add test cases
...
Add test cases for updating position of elements in
a fixed position view, WTD-1344.
2015-06-25 10:58:01 -07:00
4279c9e4bf
[Fixed Position] Remove obsolete cell styles
...
Remove obsolete cell style calculations; background
grid is handled by CSS now. Changed in the context of
WTD-1344.
2015-06-25 10:48:49 -07:00
791504584d
[Fixed Position] Update positions when grid size changes
...
Update positions of elements in a fixed position
view when grid size changes (e.g. when switching
from one domain object to another.) WTD-1344.
2015-06-25 10:45:50 -07:00
52a7bd1033
[Dev/Frontend] Cherry-picking platform changes from warp1341
...
WTD-1341
2015-06-24 18:55:15 -07:00
065a5a6fbf
[Limits] Disable failing specs
...
Disable specs which are failing after changes to support
limits, WTD-1223.
2015-06-23 13:43:00 -07:00
a4ea0dd047
Merge branch 'open-master' into open1223
...
Merge latest from master branch into topic branch for
WTD-1223
2015-06-23 13:29:47 -07:00
3b62add011
Merge branch 'open-master' into open1223
...
Conflicts:
platform/features/plot/res/templates/plot.html
2015-06-19 13:34:21 -07:00
b879de1a33
Merge branch 'open-master' into open1182
2015-06-19 12:22:05 -07:00
