Commit Graph

915 Commits

Author SHA1 Message Date
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
ca4f37b259 [Licenses] Remove license header scripts
Remove scripts for license headers, WTD-1051.
2015-06-02 11:48:23 -07:00
Victor Woeltjen
99e5feb9dc [Licenses] Change link for normalize
WTD-1051.
2015-05-29 10:37:06 -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
8156dd967f [Licenses] Reorganize licenses file
Reorganize licenses file; remove full text of Apache notice, move
other Apache-licensed dependencies to the top. WTD-1051.
2015-05-29 09:22:13 -07:00
Victor Woeltjen
61bc662efb [Licenses] Add missing copyright years
WTD-1051.
2015-05-22 14:48:53 -07:00
Victor Woeltjen
4fa99597c2 [Licenses] Update copyright year
WTD-1051.
2015-05-13 17:30:38 -07:00
Victor Woeltjen
69ea79d894 [Licenses] Add server licenses
WTD-1051.
2015-05-13 17:02:29 -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
130d3b3905 [Licenses] Update copyright years
WTD-1051.
2015-05-13 15:54:21 -07:00
Victor Woeltjen
c4a5ec0c7b [Licenses] Add usage note
Add usage note to license header script, WTD-1051.
2015-05-13 12:46:37 -07:00
Victor Woeltjen
28fbc5be09 Merge branch 'open-master' into open1051b
Merge in latest to add license headers, WTD-1051
2015-05-13 12:42:47 -07:00
Victor Woeltjen
4c6cad3e77 Merge remote-tracking branch 'nasa/open1163' into open1176
WTD-1176
2015-05-06 10:11:01 -07:00
Victor Woeltjen
2be2e23847 [Build] Bump version number
Bump version number, restore snapshot status to
open sprint Surtur. WTD-820.
2015-05-04 13:36:49 -07:00
Victor Woeltjen
bfb3a0b57b [Build] Remove snapshot status
Remove SNAPSHOT from version number to close out
sprint Skoll, WTD-820.
2015-05-04 13:31:25 -07:00
Victor Woeltjen
ad9a0b4ee2 [Info] Remove inspect from active bundles
Remove markup demonstration for info bubbles from list of
active bundles, WTD-1162.
2015-05-01 10:44:02 -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
57c5b30177 Repair to bundles.json
WTD-1150
Mistakenly checked in dev version of bundles that was using couch persistence
2015-04-28 15:05:23 -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
58c2bb701e [Pages] Add bundle to active set
Add Pages to set of active bundles, WTD-1145.
2015-04-27 15:17:44 -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
6e24052a3d [Example] Add iframe example plugin
Add example plugin with iframe; relates to WTD-1030, generally.
2015-04-23 14:04:03 -07:00