ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 13:43:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
916 Commits 989 Branches 212 Tags 191 MiB
1795dc5549
Commit Graph

838 Commits

Author SHA1 Message Date
Charles Hacskaylo
1795dc5549 Merging in /platform specific changes from warp1220 2015-06-09 16:44:18 -07:00
Charles Hacskaylo
7a93b7d77a Pulled in final sanding on bubbles.scss from open1222 2015-06-09 09:32:28 -07:00
Charles Hacskaylo
cec115976c Merged latest from open-master and open1222 platform/ 2015-06-08 16:00:24 -07:00
Victor Woeltjen
3a36fda8ab Merge remote-tracking branch 'nasa/open1219' into open1229 
Merge changes for WTD-1219; WTD-1229

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
 2015-06-08 09:53:33 -07:00
Charles Hacskaylo
e216961727 Pulling in all sass, css, etc. and static-markup work from warp1222 so far 2015-06-05 16:48:58 -07:00
Charles Hacskaylo
6fe6aacc38 Added open source comment 2015-06-03 10:25:37 -07:00
Charles Hacskaylo
b022babedb Adding static-markup bundle. 2015-06-03 10:23:49 -07:00
Charles Hacskaylo
f23f127207 [Frontend] Markup and CSS for Time Controller 
WTD-1219
Markup, CSS, etc. for time controller;
New template .html file;
Rebuilt from open-master and ue-frontend branches;
 2015-06-02 19:29:57 -07:00
Charles Hacskaylo
c20ad3764d Merge branch 'open-master' into ue-frontend 
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/lists/_tabular.scss
 2015-06-02 18:26:49 -07:00
Charles Hacskaylo
48c4282416 Merge branch 'open-master' into ue-frontend 
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/lists/_tabular.scss
 2015-06-02 18:25:26 -07:00
Charles Hacskaylo
6104201d89 [Frontend] Markup and CSS for revised scrolling tabular view 
WTD-1217
 2015-06-02 17:45:39 -07:00
Charles Hacskaylo
0fbb54add3 Merging ue-frontend 2015-06-02 17:44:59 -07:00
Charles Hacskaylo
b09ec23617 [Frontend] Renew of ue-frontend 
Picks up markup and CSS changes from
open1174 (breadcrumbs)
 2015-06-02 16:12:19 -07:00
Victor Woeltjen
ff1d4854a8 Revert "[Licenses] Remove license ref from dialog" 
This reverts commit 2ca789e36a.
Change was made to misunderstanding of instructions; WTD-1051.
 2015-05-29 10:08:43 -07:00
Victor Woeltjen
1415e9e72f [Licenses] Add missing copyright/license info 
WTD-1051.
 2015-05-29 10:05:59 -07:00
Victor Woeltjen
61bc662efb [Licenses] Add missing copyright years 
WTD-1051.
 2015-05-22 14:48:53 -07:00
Victor Woeltjen
4c720d97b7 [Licenses] Add server-side licenses 
WTD-1051.
 2015-05-13 16:47:13 -07:00
Victor Woeltjen
2ca789e36a [Licenses] Remove license ref from dialog 
WTD-1051.
 2015-05-13 16:44:57 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers 
WTD-1051.
 2015-05-13 16:43:30 -07:00
Victor Woeltjen
118d8481fb [Licenses] Update copyright years 
WTD-1051.
 2015-05-13 15:58:22 -07:00
Victor Woeltjen
4c6cad3e77 Merge remote-tracking branch 'nasa/open1163' into open1176 
WTD-1176
 2015-05-06 10:11:01 -07:00
Charles Hacskaylo
ac81968f93 [Frontend] CSS in Fixed Position view Edit mode 
WTD-1163
WTD-1114
Added CSS to give a border to all elements in Fixed Position view when in Edit mode.
Only applied to outer element, does not affect object border styling;
 2015-05-01 10:43:15 -07:00
Victor Woeltjen
ab60b92b9e Merge remote-tracking branch 'nasa/open1054' into open1162 
Merge markup/styling for info bubble, WTD-1162
 2015-05-01 10:33:16 -07:00
Charles Hacskaylo
6aadf921e1 [Frontend] Tweaks to spacing 
WTD-1163
WTD-1146
 2015-05-01 10:18:33 -07:00
Charles Hacskaylo
aec1176dc4 [Frontend] Hiding non-functional items; padding adjustments 
WTD-1163
WTD-1146
New CSS to hide non-functional elements, including browse.top-bar with search elements;
Adjusted spacing, mainly in .contents CSS class;
 2015-05-01 10:10:35 -07:00
Charles Hacskaylo
0bbe3ec99a [Frontend] CSS enhancements 
WTD-1054
Better handling of different content cases;
 2015-04-29 18:13:35 -07:00
Charles Hacskaylo
eafc603e03 [Frontend] Infobubble markup and CSS 
WTD-1054
Markup and styling for infobubble;
Includes fake data in infobubble.html
 2015-04-29 17:52:06 -07:00
Victor Woeltjen
2cba0234c5 [Pages] Add comments 
Add comments to controller for Page objects in preparation
for integration, WTD-1158.
 2015-04-29 15:05:46 -07:00
Victor Woeltjen
b2cd74e629 Merge branch 'open-master' into open1158 2015-04-29 15:02:57 -07:00
Charles Hacskaylo
ec2d5892a5 [Frontend] Markup for info bubble 
WTD-1054
Temp object to allow work on markup for info bubble
 2015-04-28 16:08:33 -07:00
Charles Hacskaylo
babe420f26 [Frontend] CSS and markup for iframe 
WTD-1150
WTD-1145
CSS and markup to cause iframes to layout properly without double scroll bars
 2015-04-28 14:49:08 -07:00
Charles Hacskaylo
582a236d8a [Frontend] Fixes, glyph and description updates 
WTD-1150
WTD-1145
Fixed incorrect references to iFrameController to EmbeddedPageController;
Added new glyph for Page;
Renamed Page to Web Page;
 2015-04-28 14:28:17 -07:00
Victor Woeltjen
617691ab24 Merge branch 'open806' into open-master 2015-04-27 15:16:21 -07:00
Victor Woeltjen
cab259415d [Pages] Test controller 
Test controller for WTD-1145.
 2015-04-27 14:58:32 -07:00
Victor Woeltjen
012fad6984 [Pages] Validate input 
Valid URL input for Pages, WTD-1145.
 2015-04-27 14:50:14 -07:00
Victor Woeltjen
01e2840aae [Pages] Move page plugin into platform 
Move Page plugin from prototype location into
platform, WTD-1145.
 2015-04-27 14:46:33 -07:00
Victor Woeltjen
a2bdeda1a0 Merge branch 'open1098' into open-master 2015-04-24 09:09:42 -07:00
Victor Woeltjen
4a4ef8c0f6 Merge branch 'open-master' into open806 
Merge in latest in preparation for review of changes
for WTD-806
 2015-04-20 19:35:19 -07:00
Victor Woeltjen
186ae05686 [Plot] Add test case 
Add test case which exercises handling of historical telemetry,
WTD-806.
 2015-04-20 17:04:34 -07:00
Victor Woeltjen
6400a670fa [Plot] Update plot with historical data 
Trigger update of displayed plot data when new historical
data becomes available, WTD-806.
 2015-04-20 17:00:30 -07:00
Victor Woeltjen
ffc122fb5c [Telemetry] Add test casese 
Add test cases for general support for handling real-time telemetry,
WTD-806.
 2015-04-20 16:51:08 -07:00
Victor Woeltjen
4d288950fd [Plot] Add test cases 
Add test cases for plot line management, WTD-806.
 2015-04-20 14:31:29 -07:00
Victor Woeltjen
e21cbbe2c6 [Plot] Add test cases 
WTD-806
 2015-04-20 11:00:54 -07:00
Victor Woeltjen
0242961e5a Merge remote-tracking branch 'nasa/open1036' into open1123 2015-04-17 17:02:20 -07:00
Victor Woeltjen
ffcd91f88d [Plot] Add test cases 
Add test cases to spec for PlotUpdater to reflect changes
for merging streaming and historical data. WTD-806.
 2015-04-17 16:55:49 -07:00
Victor Woeltjen
74b9d68dc8 [Plot] Update failing specs 
Update failing specs after changes for WTD-806.
 2015-04-17 16:42:15 -07:00
Victor Woeltjen
955c4209f0 [Plot] Add placeholder specs 
Add placeholder specs for new scripts introduced to support
merging real-time and historical telemetry, WTD-806.
 2015-04-17 15:11:22 -07:00
Victor Woeltjen
62958280b7 [Plot] Avoid clearing domain offset 
Avoid clearing domain offset unnecessarily by fixing
variable reference; WTD-806.
 2015-04-17 15:05:56 -07:00
Victor Woeltjen
8ba9c0553a [Plot] Begin integrating with telemetry handler 
Miscellaneous tweaks and fixes to begin showing merged
real-time and historical telemetry, WTD-806.
 2015-04-17 14:53:21 -07:00
Victor Woeltjen
5cc89e7983 [Plot] Update PlotController 
Update plot controller to request historical telemetry,
WTD-806.
 2015-04-17 14:09:39 -07:00