ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 21:53:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
935 Commits 989 Branches 212 Tags 191 MiB
bd66c0138b
Commit Graph

935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Hacskaylo
bd66c0138b [Merge] Bringing in latest ue-frontend 2015-06-10 15:20:38 -07:00
Charles Hacskaylo
1795dc5549 Merging in /platform specific changes from warp1220 2015-06-09 16:44:18 -07:00
Pete Richards
e6d830bfdc Merge pull request #1 from nasa/open1221 
[Platform] Tweak misc. items to support clocks/timers
 2015-06-09 10:23:06 -07:00
Pete Richards
eb9446dd14 Merge pull request #2 from nasa/open1199 
[Example] Add minimal web server
 2015-06-09 09:47:16 -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
Pete Richards
31e0e0adc7 Merge pull request #3 from nasa/open-1201 
[Integration] Window Titling
 2015-06-08 11:27:42 -07:00
larkin
689701b37f [Licenses] Add License Header 2015-06-08 11:23:25 -07:00
larkin
eb1621dad9 Merge branch 'open1200' into open-1201 2015-06-08 11:11:50 -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
Victor Woeltjen
5f64e499f4 [Example] Work around JSLint 
JSLint doesn't like Express's use of static (a reserved word) as a
method name, so change the way it's accessed. WTD-1199.
 2015-06-04 10:47:04 -07:00
Victor Woeltjen
450bc059e4 Merge branch 'open-master' into open1199 2015-06-04 10:40:34 -07:00
Victor Woeltjen
fcd214ed60 [Forms] Show initial value in datetime control 
Initialize value for datetime control based on available
data, and keep up-to-date with changes from UI. Supports
clocks/timers, which use datetime as an entry field,
WTD-1221.
 2015-06-04 09:16:25 -07:00
Victor Woeltjen
2648f01966 [Composition] Disallow composition for leaf types 
Disallow composition for domain object types which will
not have a composition property; WTD-1221.
 2015-06-04 09:16:12 -07:00
Victor Woeltjen
e452921729 [Core] Revise explicit setting of modified timestamp 
Allow undefined as an explicit value for a domain
object's modification timestamp (as set via the
mutation capability.) Avoids a bug in minimal auto-refresh,
being added for WTD-1221.
 2015-06-04 09:16:08 -07:00
Victor Woeltjen
28805cd55c [Forms] Add test cases to DateTimeController 
Add test cases for behavioral changes to DateTimeController,
added for WTD-1221.
 2015-06-04 09:15:39 -07:00
Victor Woeltjen
45568ecb21 [Forms] Allow date-time controls to be optional 
Don't force date-time inputs to act as if they are
required; allow them to be treated as optional, but
enforce that this only occurs when left completely
empty (as opposed to partially complete.)

Supports WTD-1221.
 2015-06-04 09:15:04 -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
11ab4df159 [Configuration] Ignore node modules in build 
Ignore node modules and the top-level app.js when running
JSLint for a Maven build; scope of this testing is client
code. WTD-1199.
 2015-05-21 20:47:49 -07:00
Victor Woeltjen
ce2b48981a [Windowing] Add in-line documentation 
WTD-1200.
 2015-05-20 10:06:59 -07:00
Victor Woeltjen
a937a3193b [Windowing] Show title of navigated object 
Show title of navigated object in window, WTD-1200.
 2015-05-20 09:57:04 -07:00
Victor Woeltjen
6ed14ed3a9 [Configuration] Deprioritize default constants 
Mark ElasticSearch configuration constants as priority=fallback;
these are intended to be specified/overridden on a per-deployment
basis. WTD-1199.
 2015-05-20 09:04:48 -07:00
Victor Woeltjen
3ace850d31 [Configuration] Use example persistence 
Use example persistence in open source friendly branch to avoid
need for set up of ElasticSearch when running, WTD-1199.
 2015-05-20 09:04:26 -07:00
Victor Woeltjen
2797af43e9 [Configuration] Add server app 
Add server app which provides the ability to include/exclude
bundles. WTD-1199.
 2015-05-20 09:03:55 -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