Henry
1eea5ce480
merged from master
2016-08-01 20:29:50 -07:00
Henry
4cd579d274
Pass numerical value to format functions
2016-08-01 20:16:46 -07:00
Charles Hacskaylo
11738286df
[Frontend] Styling for unsynced elements
...
Fixes #933
2016-08-01 18:56:33 -07:00
Charles Hacskaylo
ca5206d4a0
[Frontend] Fixing issues with theme coloring
...
Fixes #933
2016-08-01 18:55:49 -07:00
Charles Hacskaylo
573f1f9f99
[Frontend] Hide zoom slider control
...
Fixes #933
Temporarily hiding per request from Andrew
today;
2016-08-01 18:04:17 -07:00
Charles Hacskaylo
c5c45f0a0e
[Frontend] Update TC2 markup and sass
...
Fixes #933
Update markup and sass in TC2 to be in line with
updates from master from #1047 glyphs
to cssclass approach;
2016-08-01 18:01:28 -07:00
Henry
121ab413ff
Apply formatting, filter modes by tick source availability
2016-08-01 17:51:15 -07:00
Charles Hacskaylo
753bd97c8a
Merge remote-tracking branch 'origin/master' into open933-c
...
# Conflicts:
# platform/commonUI/edit/res/templates/create/create-menu.html
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
# platform/commonUI/general/res/sass/_archetypes.scss
# platform/commonUI/general/res/sass/_constants.scss
# platform/commonUI/general/res/sass/_icons.scss
# platform/commonUI/general/res/sass/_main.scss
# platform/commonUI/general/res/sass/_mixins.scss
# platform/commonUI/general/res/sass/controls/_buttons.scss
# platform/commonUI/general/res/templates/controls/time-controller.html
# platform/commonUI/themes/snow/res/sass/_constants.scss
2016-08-01 17:12:44 -07:00
Henry
fcd7ab93e5
Merge branch 'open933' of https://github.com/nasa/openmctweb into open933
2016-08-01 17:12:00 -07:00
Charles Hacskaylo
c699cb8b4b
Merge remote-tracking branch 'origin/master' into open933-c
...
# Conflicts:
# platform/commonUI/edit/res/templates/create/create-menu.html
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
# platform/commonUI/general/res/sass/_archetypes.scss
# platform/commonUI/general/res/sass/_constants.scss
# platform/commonUI/general/res/sass/_icons.scss
# platform/commonUI/general/res/sass/_main.scss
# platform/commonUI/general/res/sass/_mixins.scss
# platform/commonUI/general/res/sass/controls/_buttons.scss
# platform/commonUI/general/res/templates/controls/time-controller.html
# platform/commonUI/themes/snow/res/sass/_constants.scss
2016-08-01 17:11:37 -07:00
Henry
a75ea67b8c
Format updates when time system selected
2016-08-01 17:11:01 -07:00
Pete Richards
9b58aa0052
[TCv2] Add conductorService for compatibility
...
Add conductor service for compatibility with old plugins that depend
on the conductor service.
2016-08-01 17:03:00 -07:00
Charles Hacskaylo
579c6b6d24
[Frontend] Styling TC unsynced elements
...
Fixes #933
WIP: Styling for unsynced elements
2016-08-01 16:30:51 -07:00
Charles Hacskaylo
762f43fa61
[Frontend] Styling TC unsynced elements
...
Fixes #933
WIP: Styling for unsynced elements
2016-08-01 16:26:47 -07:00
Henry
ce5d0ef5bd
Merged stylesheet changes
2016-08-01 16:16:38 -07:00
Henry
142ee2f336
Added LocalTimeSystem and merged latest styles
2016-08-01 15:44:49 -07:00
Henry
482fcbf6ee
Refactored bundle
2016-08-01 15:38:12 -07:00
Victor Woeltjen
d1e1ba1c66
[Frontend] Refactor glyphs to classes
...
Squashes #1103 , fixes #1047 .
Squashed commit of the following:
commit 0e060f174d
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri Jul 29 14:55:34 2016 -0700
[Frontend] Added button to .s-button
Fixes #1047
commit 9f74395a79
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri Jul 29 14:43:36 2016 -0700
[Frontend] Fixing problems from circleci
Fixes #1047
commit 7278c9534c
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri Jul 29 14:37:21 2016 -0700
[Frontend] CSS fixes for s-status classes
Fixes #1047
Fixed .s-status-editing and s-status-pending;
commit 4606d617d1
Merge: d5bff55
59436f7
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri Jul 29 13:58:51 2016 -0700
Merge remote-tracking branch 'origin/master' into frontend-1047
commit d5bff555e0
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Thu Jul 28 19:09:33 2016 -0700
[Frontend] Updated glyphs used by plot view switcher
Fixes #1047
commit b72d82baef
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Thu Jul 28 19:09:00 2016 -0700
[Frontend] Tree styles in left pane and selector-list
Fixes #1047
commit af36b9996d
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Thu Jul 28 18:32:34 2016 -0700
[Frontend] Form validation styling
Fixes #1047
<mct-form> must now include class
'validates' to display validation glyph icons;
removed 'no-validate' from markup; cleaned
up validation scss;
commit 69dc893b4b
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Thu Jul 28 17:11:52 2016 -0700
[Frontend] Glyphs to classes, mobile
Fixes #1047
Fixes and enhancements for mobile,
particularly in tree; Removed
`display: inline-block` from containerSubtle
mixin;
commit 7bca18b186
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Thu Jul 28 11:36:19 2016 -0700
[Frontend] Rename .s-menu-btn, remove unused
Fixes #1047
.s-menu-btn > .s-menu-button;
.create-btn > .create-button;
removed unused l-btn, t-btn,
t-btns-zoom from markup
commit 5d229198b7
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Thu Jul 28 11:25:36 2016 -0700
[Frontend] Rename .s-clickable-icon to .s-icon-button
Fixes #1047
commit 36479e2e8b
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Thu Jul 28 11:20:30 2016 -0700
[Frontend] Rename .s-btn to .s-button
Fixes #1047
commit 89e4f06de9
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Thu Jul 28 11:12:07 2016 -0700
[Frontend] Apply clickable-icon class
Fixes #1047
commit e65ca1cb8b
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Thu Jul 28 10:52:35 2016 -0700
[Frontend] Updated icons
Fixes #1047
- Clock, timer, plots updated
commit 3e7eb98ac2
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 27 18:05:06 2016 -0700
[Frontend] Standardizing styles
Fixes #1047
- Finessing mini-tab and making able to
control per theme; s-clickable and s-toggle-icon
classes cleaned up
commit 18e08074a8
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 27 16:33:25 2016 -0700
[Frontend] Tweaks to sass code
Fixes #1047
- Splitter and mini-tab-icon elements
commit 44fda8d68f
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 27 09:24:53 2016 -0700
[Frontend] Multiple UI fixes and tweaks
Fixes #1047
mini-tabs, splitters and bg-splash updated;
moved position of Inspector collapse mini-tab
to allow position transition;
splitter-sm class added for Timelines;
commit 2aee8bc0d8
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jul 26 15:53:32 2016 -0700
[Frontend] Updated splash image
Fixes #1047
commit 624f09777f
Merge: ce7591f
4d2f159
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jul 26 15:02:55 2016 -0700
Merge remote-tracking branch 'origin/master' into frontend-1047
commit ce7591f642
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jul 26 11:22:23 2016 -0700
[Frontend] Fixed clock indicator
Fixes #1047
Restored no-collapse and float-right
properties;
commit 5324c8edba
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Jul 25 18:14:38 2016 -0700
[Frontend] New font and project file
Fixes #1047
New font files that were missed in
last commit; updated icomoon proj
file; fixed missing char codes in
glyphs.scss;
commit a3b2628883
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Jul 25 17:54:00 2016 -0700
[Frontend] Revised and new icon art
Fixes #1047
New icons for overlay and stacked plots;
revised art and new description for
Fixed Position object;
commit 8a41c6dbc7
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Jul 25 17:52:41 2016 -0700
[Frontend] Removing glyph definitions
Fixes #1047
Updated comment
commit eb293b21eb
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Jul 25 11:56:18 2016 -0700
[Frontend] Removing glyph definitions
Fixes #1047
Removed commented code
commit d8b1fb7781
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Jul 25 11:17:45 2016 -0700
[Frontend] Removing glyph definitions; updating tests
Fixes #1047
Search and removal of "glyph" definitions in bundle
and other JS files; updating tests accordingly;
commit 650fbcc921
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Jul 25 10:20:33 2016 -0700
[Frontend] Removing glyph definitions; updating tests
Fixes #1047
Search and removal of "glyph" definitions in bundle
and other JS files; updating tests accordingly;
commit 574b8bd5c1
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Fri Jul 22 19:11:56 2016 -0700
[Frontend] Updated tests for glyph refactoring
Fixes #1047
Fixing test cases
commit dd84177441
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Fri Jul 22 18:47:45 2016 -0700
[Frontend] Updated tests and examples for glyph refactoring
Fixes #1047
WIP: Fixing test cases: fixed test in Timers that was expecting
glyph return;
commit 2231f8e124
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jul 21 17:45:20 2016 -0700
[Frontend] Updated tests for glyph refactoring
Fixes #1047
Fixing test cases: fixed test in Timers that was expecting
glyph return;
commit ae59ecfa97
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jul 21 17:38:45 2016 -0700
[Frontend] Fixed style
Fixes #1047
WIP: fixed line-height issue for t-item-icon class
commit d43bff1445
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jul 21 17:07:49 2016 -0700
[Frontend] Fixed colors
Fixes #1047
WIP: fixed colors and style defs related to clickable
icons
commit c2db6f8805
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jul 21 16:32:17 2016 -0700
[Frontend] Fixed colors
Fixes #1047
WIP: fixed colors related to changes to
btnSubtle mixin; new constants for clickable
icons
commit a4753c44d1
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jul 21 15:23:58 2016 -0700
[Frontend] Added new icon-brackets to symbols font
Fixes #1047
WIP
commit 2704640b94
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jul 21 15:11:28 2016 -0700
[Frontend] Normalize color constants
Fixes #1047
Normalize color constant values for themes; consolidated
and cleaned up btn-related mixins; fixed hover color issues
commit 421286c7e4
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jul 21 14:10:13 2016 -0700
[Frontend] Convert new Fixed Position Display from glyphs
Fixes #1047
WIP
commit a4111f3855
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jul 21 14:07:38 2016 -0700
[Frontend] Refactoring Timeline glyphs, s-btn fixes
Fixes #1047
WIP: Timeline-related glyph refactoring; s-btn
styles and hover color fixes
commit 883f999215
Merge: 9d9cabb
14f1a1f
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jul 21 08:53:23 2016 -0700
Merge remote-tracking branch 'origin/master' into frontend-1047
commit 9d9cabb760
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jul 19 16:20:20 2016 -0700
[Frontend] Glyph refactoring
Fixes #1047
WIP: search, toolbar buttons; mods
to flex archetypes
commit 28b663ce41
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Jul 18 14:58:40 2016 -0700
[Frontend] Glyph-related style changes to toolbars and buttons
Fixes #1047
Glyph refactoring WIP for toolbar buttons;
Timeline glyph refactoring continued
commit a9326f572f
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Jul 18 13:36:45 2016 -0700
[Frontend] Glyph-related style changes to Timelines
Fixes #1047
Timeline glyph refactoring; Resource Graph icons
in swimlanes now display grayed-out version when not
added to the Resource Graph; minor color tweaks
commit d6e1737803
Merge: 88054e5
6176ca2
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Jul 18 10:29:32 2016 -0700
[Frontend] Merge master into frontend-1047
Fixes #1047
Resolved conflict in icomoon.json file
commit 88054e5e8e
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jun 30 16:55:40 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
In progress: significant mods to pane collapse/expand
buttons and symbols, minor tweaks to splitter look,
limits glyph definitions
commit 7c47343f5c
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jun 30 16:52:21 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
In progress: updated font files glyphs, mostly
for pane collapse icons
commit fd00bdce54
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jun 30 12:20:55 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
In progress: search menu
commit 272b4b649e
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jun 30 12:11:25 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
In progress: moved limits classes out
of _contants and into _glyphs;
timers, entanglement context menu items,
form validation, date picker.
commit 95d26e6fe7
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jun 29 14:18:12 2016 -0700
[Frontend] Refactoring glyphs to classes
Fixes #1047
In-progress; limits
commit 26b30d96db
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jun 28 17:16:18 2016 -0700
[Frontend] Refactoring glyphs to classes
Fixes #1047
In-progress; overlay close, search inputs,
messages and message banners,
ui-symbol removal in-progress.
commit 4e2a01ad85
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jun 28 16:21:05 2016 -0700
[Frontend] Refactoring glyphs to classes
Fixes #1047
In-progress; .labeled added to .s-btn,
removed .s-icon-btn
commit 521db3c3fe
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jun 28 16:10:54 2016 -0700
[Frontend] Refactoring glyphs to classes
Fixes #1047
In-progress; plot options, imagery buttons,
cleanups in buttons.scss, edit-action buttons,
.s-btn .no-label class added.
commit 8bb8db69e6
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jun 28 14:47:52 2016 -0700
[Frontend] Refactoring glyphs to classes
Fixes #1047
In-progress; indicators, notifications, actions,
tests
commit 53ed0bfb22
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Jun 27 17:01:45 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
In progress, really: view icons, timer/clock
commit 47dc7f2f6b
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Jun 27 16:13:31 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
In progress: grid items
commit 2bd34f71be
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Jun 27 15:00:46 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
Context menus and associated actions,
custom checkboxes, tree item being edited
commit b561d4f60e
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Jun 27 14:27:56 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
In-progess: glyphs.scss now uses $vars to
allow other scss to use a var instead of string
literals;
commit 0cf4089620
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Jun 27 14:13:59 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
In-progess: tree-labels, unknown objects, object
header
commit 46cae10905
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Jun 27 11:41:06 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
In-progess, menus and Create menu fixes
commit fe3097707f
Merge: 7d69ae4
652a50c
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Jun 27 11:20:55 2016 -0700
Merge remote-tracking branch 'origin/master' into frontend-1047
commit 7d69ae401b
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jun 23 15:59:56 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
In-progress, converting types, mods to
Create Menu template
commit 18d9f3d6b2
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jun 23 15:14:22 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
Very much In-progess: convert some controls;
commit e93a90a782
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jun 23 11:28:07 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
Very much In-progess, classes for all symbols
added to glyphs.scss; .menu cleaned up;
commit dc670b22a6
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Jun 23 08:55:27 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
Very much In-progess, "icon-" selector,
browse bar buttons
commit 8b29ccf3af
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Wed Jun 22 23:15:24 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
Very much In-progess, s-btn and
s-btn-menu refactoring
commit f574ffed16
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Wed Jun 22 14:37:34 2016 -0700
[Frontend] Refactoring glyphs to classes
fixes #1047
In-progess, e900 > e904
commit bc62ee4565
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Wed Jun 22 13:28:15 2016 -0700
[Frontend] Complete revamp of unicodes
fixes #1047
New font files; no re-mapping yet in the app.
commit 614f0c6e9f
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Wed Jun 22 13:23:18 2016 -0700
[Frontend] Complete revamp of unicodes
fixes #1047
Moved all glyphs into PUA area of font, and
re-organized by category.
commit 47bd4031d5
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jun 21 18:39:48 2016 -0700
[Frontend] Renaming symbols font files
Fixes #1047
- Modified sass to point to renamed font files;
- Added new 12px symbols font files to sass;
commit 22a51d6bbb
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jun 21 18:22:33 2016 -0700
[Frontend] Updating Icomoon project files
Fixes #1047
- Renamed main project file;
- Added new 12px symbols project file;
commit 13ded2fd84
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jun 21 18:19:27 2016 -0700
[Frontend] Added new 12px symbols font files
Fixes #1047
commit aef5660dfd
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jun 21 18:16:56 2016 -0700
[Frontend] Renaming symbols font files
Fixes #1047
2016-08-01 14:33:25 -07:00
Charles Hacskaylo
523d6743fb
[Frontend] Added support for thematic styling of Time Conductor v2
...
Fixes #933
Added theme sass files
2016-08-01 12:00:53 -07:00
Victor Woeltjen
59436f7b45
[Tests] Load all sources ( #1098 )
...
Load all source files when running Karma's test suite; this
ensures that code coverage metrics are not invalidated by
missing files. Fixes #1090 .
2016-07-28 10:45:38 -07:00
Henry
7af22126d4
Prevent tabbing into end bounds when not in fixed mode
2016-07-27 12:05:03 -04:00
Henry
8e59072537
Removed LAD and Realtime modes
2016-07-27 12:04:02 -04:00
Henry
c1bbc4f01d
Code cleanup
2016-07-27 10:38:04 -04:00
Henry
aa4a5e56f9
Improved support from plot
2016-07-26 16:55:00 -04:00
Henry
5b2eb72b16
[Time Conductor] Addressed documentation issues
2016-07-26 08:33:30 -04:00
Henry
1b7fc57d21
Added status support to plots
2016-07-25 16:55:27 -04:00
Victor Woeltjen
4d2f159dd8
[Build] Bump version number
...
...and restore SNAPSHOT status to open sprint Niven,
https://github.com/nasa/openmct/milestone/15
2016-07-25 12:07:41 -07:00
Victor Woeltjen
26a9d53f3b
[Build] Remove SNAPSHOT Status
...
To close sprint Le Guin,
https://github.com/nasa/openmct/milestone/14
2016-07-25 11:46:40 -07:00
Henry
a4f6f6f50b
Added license
2016-07-25 12:09:23 -04:00
Henry
19fd63b850
Merge branch 'open933-frontend-b' into open933
2016-07-21 20:06:50 -07:00
Henry
c2c8e16453
Added scale sensitive formatting to UTCTimeFormat
2016-07-21 20:05:28 -07:00
Charles Hacskaylo
a10ded25b4
Merge remote-tracking branch 'origin/open933' into open933-frontend-b
...
# Conflicts:
# platform/features/conductor-v2/res/sass/time-conductor.scss
# platform/features/conductor/res/sass/time-conductor.scss
2016-07-20 18:33:58 -07:00
Charles Hacskaylo
da7c636724
[Frontend] Time Conductor v2 styling
...
Fixes #933
Redo TC icon to use font symbol, added
new symbol for brackets to font files; font
anti-aliasing mod for .ui-symbol class;
layout tweaks; mobile tweaks.
2016-07-20 18:22:20 -07:00
Charles Hacskaylo
b392633bc6
[Frontend] Time Conductor v2 styling
...
Fixes #933
WIP: Significant mobile and desktop style tweaks;
moved constants into their own include file;
2016-07-20 15:48:22 -07:00
Charles Hacskaylo
ff1678435e
[Frontend] Time Conductor v2 styling
...
Fixes #933
Changed desktop and mobile RT UI to display
end datetime and hide start;
WIP: mobile styling for main UI of TC;
2016-07-20 11:43:40 -07:00
Charles Hacskaylo
2124fe01e1
[Frontend] Renew support for Time Conductor v1
...
Fixes #933
Minor fixes to TCv1 for mobile
2016-07-20 10:18:42 -07:00
Henry
e6d8944547
Modified main.js
2016-07-19 20:17:06 -07:00
Charles Hacskaylo
ea1defac28
[Frontend] Renew support for Time Conductor v1
...
Fixes #933
Time Conductors v1 and v2 now build and load their
own isolated CSS files. All previous styling for TCv1
should be re-enabled. Note that Conductor v2 mobile
is not complete yet.
2016-07-19 20:00:32 -07:00
Henry
2a19394334
Added compatibility layer to support existing plots and historical tables
2016-07-19 19:54:52 -07:00
Charles Hacskaylo
f641edbce7
[Frontend] Renew support for Time Conductor v1
...
Fixes #933
Time Conductors v1 and v2 now build and load their
own isolated CSS files. All previous styling for TCv1
should be re-enabled. Note that Conductor v2 mobile
is not complete yet.
2016-07-19 18:33:24 -07:00
Henry
15a608a861
Populate format in input fields
2016-07-18 18:44:29 -07:00
Henry
334ca64551
Merged open933-frontend
2016-07-18 14:25:02 -07:00
Henry
0af49efe06
Refactored out modes, time systems, etc.
2016-07-18 12:49:44 -07:00
Pete Richards
14f1a1f740
Merge remote-tracking branch 'origin/open1031'
2016-07-18 11:43:55 -07:00
Pete Richards
5a6c209369
Merge branch 'jesusprubio-open1036'
2016-07-18 11:39:04 -07:00
Pete Richards
8c2ce81b76
Merge branch 'open1036' of https://github.com/jesusprubio/openmct into jesusprubio-open1036
2016-07-18 11:37:00 -07:00
Pete Richards
99ec188813
Merge remote-tracking branch 'origin/open254'
2016-07-18 11:35:43 -07:00
Pete Richards
41d0089e53
Merge remote-tracking branch 'origin/open1065'
2016-07-18 11:19:55 -07:00
Pete Richards
8ed9f51008
Merge remote-tracking branch 'origin/open1075-fixed'
2016-07-18 11:17:05 -07:00
Andrew Henry
6176ca2260
Merge pull request #1084 from nasa/transaction-clearing-1059
...
[Persistence] Clear transactions selectively
2016-07-15 16:20:19 -07:00