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

64 Commits

Author SHA1 Message Date
akhenry
92cf86837b Merge pull request #207 from nasa/open1239 
[Plugins] Bring over Timeline, Clocks/Timers
 2015-11-05 13:42:32 -08:00
Pete Richards
9523c918fb Merge remote-tracking branch 'github-open/open182' into open-master 2015-11-03 15:52:14 -08:00
Charles Hacskaylo
1e6731e6f2 Merge open155 > github/master 
open155
open186
Trying a third time to resolve conflicts between open155 and master;
 2015-10-30 16:20:57 -07:00
Victor Woeltjen
8a3f77d784 [Time Conductor] Simplify bundle name 2015-10-27 17:26:08 -07:00
Victor Woeltjen
cc8a7e513f [Time Conductor] Rename bundle 
Rename platform/time to platform/commonUI/formatting; nothing
particularly specific to time about these interfaces, and
removal of non-formatting-related methods makes this essentially
a UI concern.
 2015-10-27 13:11:04 -07:00
Victor Woeltjen
a43c8f2ce8 [Timeline] Disable timelines due to missing styles 
WTD-1239.
 2015-10-23 14:14:24 -07:00
Victor Woeltjen
83f135e48c Merge remote-tracking branch 'github/master' into open1239 2015-10-23 13:39:09 -07:00
Victor Woeltjen
a154c9c870 [Time Conductor] Use timeService from control 2015-10-22 15:51:12 -07:00
Victor Woeltjen
dbe1875e70 [Themes] Resolve conflicts 
Resolve conflicts in preparation for merge, nasa/openmctweb#118
 2015-09-22 16:12:44 -07:00
Charles Hacskaylo
54334a8906 [Frontend] Setting default theme for open back to espresso 
open #95b
Also removed unused COMPILE.scss file;
 2015-09-21 14:26:50 -07:00
Charles Hacskaylo
c9b2f5804d [Frontend] Minor tweaks to sizing of controls 
open #95b
View switcher and plot control buttons now made small
when object is in a frame context in a Layout;
 2015-09-21 14:24:19 -07:00
Victor Woeltjen
dce7253b27 [Mobile] Move mobile bundle 2015-09-18 09:17:01 -07:00
Victor Woeltjen
6aba34dd5a [Mobile] Override browse behavior 
Override browse tree behavior such that tree collapses upon
navigation change in mobile.
 2015-09-17 17:54:01 -07:00
Victor Woeltjen
72c122e0ee Merge remote-tracking branch 'github/master' into open95b 
Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js
 2015-09-15 11:35:25 -07:00
Victor Woeltjen
c932e953bc [Plugins] Bring over timeline, clock plugins 
WTD-1239
 2015-09-14 16:45:41 -07:00
Victor Woeltjen
36e38b9454 [Persistence] Add local storage to active bundles 2015-09-11 13:54:33 -07:00
Charles Hacskaylo
3b2454c6a9 [Frontend] IN-PROGRESS Theming continues 
open #95
Search, plots;
Minor tweaks to add shdw to items and buttons;
 2015-09-10 11:43:39 -07:00
Charles Hacskaylo
32b895ba62 [Frontend] IN-PROGRESS Theme changes continuing 
open #95
Refactored btnSubtle and containerSubtle mixins
to simplify;
 2015-09-09 16:49:59 -07:00
Charles Hacskaylo
37c34c668c [Frontend] IN-PROGRESS Major restructuring of /platform/commonUI/ to add themes structure 
open #95
New themes bundle files, .scss and directories;
Moved constants definitions (mainly colors) from commonUI/.../_constants
to individual themes _constants files;
tweaks to mixins files;
changed pathways to font and images in commonUI/.../_constants;
 2015-09-03 15:34:39 -07:00
Victor Woeltjen
5400f51204 [Identity] Include identity bundle 
...in list of active bundle, nasa/openmctweb#92
 2015-08-28 15:47:30 -07:00
slhale
35316dc31c [Search] Clean up 
Removed additional reference to searhc UI, as well
as correct persistence provider.
 2015-08-04 10:35:15 -07:00
slhale
9be646f1e7 [Search] Moved search folder location 
Moved search from platform/features/search to
platform/search. Added more style corrections.
 2015-08-03 09:51:36 -07:00
shale
232a648fbd Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-07-27 09:14:52 -07:00
larkin
12b8408bca [Entanglement] Enable Entanglement 2015-07-22 15:32:20 -07:00
shale
2432e9c2aa [Search] Using ElasticSearch 2015-07-13 10:13:46 -07:00
shale
5870248617 [Search] Search framework 
Created a basic framework for a search
view. It consists of a search bar and
a results list.
 2015-07-08 15:32:20 -07:00
Sarah Hale
bf8b0bae03 Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 14:51:18 -07:00
larkin
a3f3f5bb27 Merge remote-tracking branch 'origin/open1170' into open-1318 2015-06-25 11:06:44 -07:00
Sarah Hale
0feb3b0462 Merge branch 'open18' of https://github.com/slhale/openmctweb into open18 2015-06-22 12:37:15 -07:00
Charles Hacskaylo
ae7dae011b [Dev/Frontend] New example event generator and event view 
WTD-1304
github open18
New example generator;
New temporary view: features/events;
Updated scss and css;
 2015-06-19 15:29:06 -07:00
Victor Woeltjen
7d911a3fe0 [Workers] Add worker service 
Add service for running WebWorkers, #12.
 2015-06-18 10:59:10 -07:00
Charles Hacskaylo
69f4b4975e Merge branch 'open-master' into open1170b 
Conflicts:
	platform/commonUI/general/res/sass/plots.scss
	platform/commonUI/inspect/src/InfoConstants.js
	platform/features/imagery/src/policies/ImageryViewPolicy.js
	platform/features/static-markup/res/markup.html
 2015-06-18 09:55:26 -07:00
Victor Woeltjen
0cb439df19 [Imagery] Add imagery to active bundles 
WTD-1170.
 2015-06-12 12:11:47 -07:00
Charles Hacskaylo
d7e43026cd [Merge] Merge in open-master, resolve conflicts in _constants.scss 2015-06-10 14:04:48 -07:00
Victor Woeltjen
87e80e763c [Info Bubble] Include in set of active bundles 
Include the info bubble in the set of active bundles, WTD-884.
 2015-06-04 12:35:42 -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
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
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
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
24b1e3134e [Containment] Add containment to list of bundles 
Add containment enforcement to list of active bundles, WTD-962.
 2015-04-07 20:52:11 -07:00
Victor Woeltjen
931ca73d6b [Containment] Merge in policy 
Merge in policy support, as this is necessary to support
containment rules, WTD-962.
 2015-04-07 20:03:00 -07:00
Victor Woeltjen
04005ce75f [Policy] Add spec for action decorator 
Add spec for decorator which prunes out applicable actions
based on policy. WTD-973.
 2015-04-01 14:34:06 -07:00
Victor Woeltjen
2554f4ab01 [Core] Add model cache 
Add a cache for domain object models which prevents unnecessary
reload of those objects. WTD-1033.
 2015-03-20 16:26:39 -07:00
Victor Woeltjen
acf058849f [Persistence] Begin integrating persistence queue 
Begin integrating persistence queue, tweaking for issues
detected through minimal use. WTD-1033.
 2015-03-20 14:06:11 -07:00
Victor Woeltjen
f2f9b8bbee [Persistence] Update Elastic persistence 
Update ElasticSearch persistence provider to use ElasticSearch's
API, WTD-1033.
 2015-03-19 17:12:56 -07:00
Victor Woeltjen
6896eea150 [Persistence] Update bundles.json 
Update bundles.json to reflect the splitting of the persistence
bundle into separate bundles for the Couch adapter and for the
persistence cache, in support of WTD-702.
 2015-01-20 13:00:32 -08:00
Victor Woeltjen
9a400f6fba [About] Add About bundle 
Add bundle platform/commonUI/about, and initial templates for
the About dialog. WTD-667.
 2015-01-14 10:44:59 -08:00
Victor Woeltjen
03179284f4 [Persistence] Deactivate example 
Deactivate example persistence; this was left in
the set of active bundles erroneously in WTD-602.
 2014-12-10 13:40:06 -08:00