ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 14:32:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,646 Commits 989 Branches 212 Tags 191 MiB
549dfab5aa
Commit Graph

111 Commits

Author SHA1 Message Date
Pete Richards
668b09b789 [Style] Pull functions out of loop 
Pull functions out of loop for jshint compliance.
 2016-03-01 13:25:37 -08:00
Pete Richards
748673f99b Merge branch 'master' into open638_rebase 2016-03-01 10:48:53 -08:00
Andrew Henry
6f9e78a14f Merge pull request #711 from nasa/open442a 
[Frontend] Markup, CSS changes
 2016-02-29 17:36:54 +00:00
Charles Hacskaylo
5a9bcfa938 [Frontend] Markup, CSS changes 
#442
Removed white space from markup;
Moved getGlyphClass up to status-block-holder
element out of status-block;
CSS mods to selectors and style defs
in _messages.scss;
 2016-02-26 16:48:23 -08:00
Henry
402512a461 Merged from master to resolve conflict 2016-02-26 15:15:22 -08:00
Victor Woeltjen
a73f1ebbbd Merge pull request #637 from nasa/rems_data 
[Examples] Rems data integration
 2016-02-26 14:21:30 -08:00
Henry
4674918b4b [Examples] #359 Updated to attempt connection to remote data source and fallback to local if unavailable 
Minor change to readme

Fixed JSLint errors

More JSLint errors

[Example] Rems data integration - disabled bundle by default.

[Examples] REMS data integration - added newlines at end of files

[Example] Added time conductor support to REMS data integration

Added caching of results

[Examples] Added domain format to REMS data #359

[Example] #637 Added local proxy to app.js to allow cross-origin requests

Updated readme
 2016-02-26 14:03:10 -08:00
Henry
5e7eb7e87e [Examples] #703 Changed imagery telemetry metadata to use 'utc' format for time 2016-02-26 09:32:03 -08:00
Pete Richards
fcdf89a4ee Merge branch 'master' into open638_rebase 2016-02-23 10:56:13 -08:00
Pete Richards
0a71835687 [Build] Switch compass to bourbon 
Change mixin library to bourbon.  Significantly reduces sass build time.

https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:02:16 -08:00
Victor Woeltjen
6880c82719 [CSV Export] Restructure example 
Restructure CSV export example to reflect recommended style
for plugins, per code review;
https://github.com/nasa/openmctweb/pull/652#discussion_r52263869
 2016-02-09 12:13:33 -08:00
Henry
645bd5743f [Plots] #638 Addressing feedback from code review 
[Plots] #638 Fixing failing tests

[Plot] Changed PlotOptionsController to prototype form

Fixed spacing

Fixed jslint issue
 2016-02-08 23:36:45 -08:00
Victor Woeltjen
8c1264ab22 [CSV Export] Add example of exportService usage 2016-02-05 15:07:18 -08:00
Henry
9371fcbc4c [Plot] #638 Added a new plot options example bundle and rebased 
Fixed jsdoc

Fixed incorrect memberof declaration

Corrected memberof statement
 2016-02-04 15:17:07 -08:00
Henry
c091063b83 [Examples] #359 Cleaned up REMS data integration example. 2016-01-22 10:49:40 -08:00
Victor Woeltjen
cec197f888 [API Refactor] Remove bundle.json files 2016-01-08 15:32:18 -08:00
Victor Woeltjen
de53247d56 [API] Convert JSON bundles to imperative form 2016-01-07 15:08:08 -08:00
Henry
2e65a6a63e Updating code to conform to code style 2015-12-11 15:39:53 -08:00
Victor Woeltjen
4b82893c36 [Performance] Improve digests/sec indication 
Don't let past digest counts bias current rate shown;
https://github.com/nasa/openmctweb/issues/369
 2015-12-03 13:27:19 -08:00
Henry
73ca30e654 Merged changes from Master 2015-12-01 10:44:42 -08:00
Victor Woeltjen
7974ffdda2 Merge remote-tracking branch 'github/master' into open245b 
...in preparation to complete merge nasa/openmctweb#257

Conflicts:
	platform/entanglement/src/actions/CopyAction.js
	platform/entanglement/src/actions/LinkAction.js
	platform/entanglement/src/actions/MoveAction.js
 2015-11-21 07:05:51 -08:00
akhenry
4de7b7dfb5 Merge pull request #288 from nasa/open218 
[Plot] Support domain/range switching
 2015-11-18 11:54:13 -08:00
Victor Woeltjen
7dc6f553ac [Plot] Expose alternate domain values correctly 
...from example telemetry (sine wave generator), to support
testing of switching among domains within plot.
 2015-11-10 16:12:36 -08:00
Charles Hacskaylo
d8ced8f635 [Frontend] Hide/show Create button in mobile 
open #250
open #157
Create button now hidden by default in mobile via
usage of CSS; can be re-displayed by including
'example/mobile' bundle;
 2015-11-09 17:10:57 -08:00
Victor Woeltjen
eef801f1ae [Persistence] Fix read in example 
Values are stored in the scratchpad as JSON, so parse them
as JSON before returning them.
 2015-11-05 18:00:51 -08:00
Victor Woeltjen
dbff9e2125 [Persistence] Add example provider 
...to serve as a secondary persistence store.
 2015-11-05 17:38:51 -08:00
Victor Woeltjen
bed1556a3a [Persistence] Begin adding example bundle 
Begin adding example bundle illustrating usage of secondary persistence
stores. Scratchpad will 'persist' objects only in memory.
 2015-11-05 17:30:27 -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
44fc9423df Merge branch 'open-master' into open182 
Merge in latest from master branch into topic branch
for nasa/openmctweb#182
 2015-10-27 15:54:18 -07:00
Victor Woeltjen
6b805183b0 [Time Conductor] Parse negative values 
...in example telemetry
 2015-10-27 12:35:15 -07:00
Charles Hacskaylo
a8856c0612 [Frontend] Platform-specific mods to limits 
vista#54
Refactor limits into multiple classes, separating
upr/lwr from red/yellow;
Modded SineWaveLimitCapability accordingly;
Normalized upr/lwr glyphs;
(cherry picked from commit a26d71b)
 2015-10-27 11:43:28 -07:00
Victor Woeltjen
3bdaae292e [Time Conductor] Parse deltas relative to generation start 2015-10-27 10:27:29 -07:00
Victor Woeltjen
b627de45ba [Time Conductor] Fix bundle definition 
...such that the delta domain exposes its format, and its format
is exposed correctly under the formats extension category.
Supports testing of time conductor support for alternative
time formatting.
 2015-10-27 10:01:32 -07:00
Victor Woeltjen
b928b7d3f2 [Time Conductor] Fix time calculation in example telemetry 2015-10-27 09:54:09 -07:00
Victor Woeltjen
df6cd8f403 [Time Conductor] Expose domain options 
...for example telemetry, to test domain selection.
 2015-10-27 09:50:59 -07:00
Victor Woeltjen
741fc57442 [Time Conductor] Add alternate domain 
Begin adding a more timelike alternately-formatted domain
to sine waves; the 'delta' can be expressed as UTC timestamps
but will be formatted for display as a time relative to
when sine wave generation began.
 2015-10-27 09:39:48 -07:00
Victor Woeltjen
ed9a5b0890 [Time Conductor] Roll back changes to example telemetry 
In particular, remove the timeService implementation; this is made
obsolete by a switch to a simpler format-based approach.
 2015-10-26 10:06:58 -07:00
Andrew Henry
fc751b1332 Merge remote-tracking branch 'origin/open181' into rems_data_merge 2015-10-22 21:31:45 -07:00
Andrew Henry
cdc2a407dc Fixed erroneous data 2015-10-22 21:30:13 -07:00
Victor Woeltjen
67cf8d8cee [Time Conductor] Support index domain from sine wave 2015-10-22 16:24:55 -07:00
Victor Woeltjen
a154c9c870 [Time Conductor] Use timeService from control 2015-10-22 15:51:12 -07:00
Victor Woeltjen
1e71df5ce9 [Time Conductor] Implement timeService in sinewave telemetry 
Switch from initial dateService interface to more practical
timeService interface.
 2015-10-22 15:27:40 -07:00
Victor Woeltjen
e8d7093eb5 [Time Conductor] Use time systems from time conductor 2015-10-22 13:07:04 -07:00
Victor Woeltjen
9bc4327c59 [Time Conductor] Add non-time-like domain 
Add a non-time-like domain to sine wave generator telemetry,
to support integration of custom domain formatting into
time conductor.
 2015-10-22 12:51:18 -07:00
Andrew Henry
14722a6ef5 Reset histories before fetching 2015-10-16 08:32:44 -07:00
Andrew Henry
0538d6e60f Initial working version 2015-10-12 19:54:03 -07:00
Andrew Henry
1fcf900271 Added telemetry request ID prefix 2015-10-12 10:41:21 -07:00
Andrew Henry
183468fcbf Trying to figure out why requests have no 'source' property 2015-10-10 12:17:30 -07:00
Victor Woeltjen
1efa97e6f5 Merge remote-tracking branch 'github/master' into open115b 
Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
 2015-10-09 10:32:43 -07:00