ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-23 15:02:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,703 Commits 989 Branches 212 Tags 191 MiB
e09cf91def
Commit Graph

2703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henry
688718cad0 Fixed jslint errors 2015-10-15 13:10:03 -07:00
Andrew Henry
efb7611f6e Added Table of Contents generation 2015-10-15 12:35:38 -07:00
Andrew Henry
d3ff0a258e Added links to architecture document from services 2015-10-14 19:18:27 -07:00
Andrew Henry
4f18663c71 Fixed title in tutorials 2015-10-14 17:14:00 -07:00
Andrew Henry
8c2a29e895 Modified file copy prcess to prevent encoding of png's as utf8 2015-10-14 17:11:08 -07:00
Charles Hacskaylo
821a1a485c [Production] Updated symbols font to v25 
open #188
Added icon-dataset e611;
 2015-10-14 16:45:55 -07:00
Henry
f08725b6a2 Fixed jshint errors 2015-10-14 16:22:11 -07:00
Henry
301b73c6c6 Banner notifications are not maximized if 'info' message 2015-10-14 16:22:10 -07:00
Henry
912e70d219 Fixed failing tests, and added stopPropagation to prevent maximizing of notifications on action click or dismiss 2015-10-14 16:22:10 -07:00
Henry
1d41939418 Fixed failing tests 2015-10-14 16:22:10 -07:00
Henry
ee382be38d Added transitions and severity classes 2015-10-14 16:22:10 -07:00
Charles Hacskaylo
34ea3ad9bb [Frontend] Banner message animations; class renaming 
open #163
open #170
Added transition animations to message banners;
Renamed $colorStatus* class names to map more
closely to severity constants;
 2015-10-14 16:22:10 -07:00
Henry
2ba6f18c59 Making changes to implement display queue 2015-10-14 16:22:10 -07:00
Henry
b2a09599a0 Modified messages dialog launcher 2015-10-14 16:22:10 -07:00
Henry
11264759ec Added highest severity calculation in NotifiationService 2015-10-14 16:22:10 -07:00
Andrew Henry
c0ff6de27b Added notification indicator 2015-10-14 16:22:10 -07:00
Henry
60dda8a7a4 Updated 2015-10-14 16:21:54 -07:00
Charles Hacskaylo
9cc0c0b06f [Frontend] Polishing of styles for time-controller 
open #179
open #180
Font-size normalized for time-controller and domain selector;
Layout of object-holder and time-controller fixed;
 2015-10-14 10:25:05 -07:00
Henry
5b617295e9 Did review of tutorials 2015-10-13 13:54:24 -07:00
Andrew Henry
53a3a2f459 Additional editing 2015-10-13 13:54:24 -07:00
Andrew Henry
64fae21d16 Fixed code formatting error 2015-10-13 13:54:24 -07:00
Andrew Henry
87f48aac35 Fixed code formatting error 2015-10-13 13:54:24 -07:00
Andrew Henry
e43a788a6d Fixed code formatting error 2015-10-13 13:54:24 -07:00
Andrew Henry
fa487e026e Fixed code formatting error 2015-10-13 13:54:24 -07:00
Andrew Henry
3701fd75dd Finished first pass of tutorials 2015-10-13 13:54:24 -07:00
Andrew Henry
d787e84fd4 Updated tutorials 2015-10-13 13:54:24 -07:00
Andrew Henry
1922e1e241 Finished developer guide 
Fixed date of modification
 2015-10-13 13:54:24 -07:00
Andrew Henry
e52f53b7ff Fixed markdown 2015-10-13 13:54:24 -07:00
Andrew Henry
d1be256691 Reverted gendocs changes 2015-10-13 13:54:12 -07:00
Henry
82ae9e72c1 Integrated notifications list 2015-10-09 14:17:55 -07:00
Pete Richards
c703714cb3 Merge remote-tracking branch 'github-open/open115b' into open-master 2015-10-09 13:50:27 -07:00
Victor Woeltjen
b48a07cd3e Merge pull request #168 from nasa/mct80 
[Plot] Dates show 1970 when there is no data
 2015-10-09 13:40:04 -07:00
Pete Richards
8c29c8ed0e Merge remote-tracking branch 'github-open/open151' into open-master 2015-10-09 13:38:20 -07:00
Henry
85300d3743 Refactored DialogService a little 2015-10-09 11:57:47 -07:00
Victor Woeltjen
5763511ec8 [Time Conductor] Update specs 
Update specs to reflect merge of latest from master into
topic branch for nasa/openmctweb#115, domain selector.
 2015-10-09 11:17:57 -07:00
Victor Woeltjen
2accf21518 [Time Conductor] Add missing semicolon 
...to pass code style checks.
 2015-10-09 11:08:02 -07:00
Victor Woeltjen
28c42fcd4c [Time Conductor] Fix merge issues 
Fix merge issues not addressed during conflict resolution.
 2015-10-09 11:06:41 -07:00
Henry
fe3e3325e1 Merge branch 'open170' into open155 2015-10-09 11:00:09 -07:00
Henry
2b97d61d6c Further integration work 2015-10-09 10:59:36 -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
Victor Woeltjen
756f728865 Merge remote-tracking branch 'github/open1515' into open-master 2015-10-09 10:11:11 -07:00
Victor Woeltjen
d8276c532b Merge remote-tracking branch 'github/master' into open115b 
Merge in latest from master into topic branch for
nasa/openmctweb#115

Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
	platform/features/conductor/src/ConductorTelemetrySeries.js
	platform/features/conductor/src/TimeConductor.js
	platform/features/conductor/test/ConductorRepresenterSpec.js
	platform/features/conductor/test/ConductorTelemetrySeriesSpec.js
 2015-10-09 10:04:15 -07:00
Pete Richards
fc0bfa77db Merge remote-tracking branch 'github-open/open141' into open141-integration 2015-10-09 09:52:35 -07:00
Pete Richards
12c6e53939 Merge remote-tracking branch 'github-open/open157' into open-master 2015-10-09 09:47:23 -07:00
Victor Woeltjen
4f716ad5c5 Merge pull request #162 from nasa/open117 
Review and integrate open117
 2015-10-09 09:44:48 -07:00
Pete Richards
8093fcbda1 Merge remote-tracking branch 'github-open/open139c' into open-master 2015-10-09 09:42:22 -07:00
Pete Richards
0ea5721f76 Merge remote-tracking branch 'github-open/open-readme-cairo' into open-master 2015-10-09 09:38:32 -07:00
Victor Woeltjen
d902943552 [Time Conductor] Satisfy JSLint 
...in preparation to merge pull request nasa/openmctweb#162
 2015-10-09 09:36:57 -07:00
Victor Woeltjen
5f7c8ccadb Merge remote-tracking branch 'github/master' into open117b 2015-10-09 09:35:07 -07:00
Victor Woeltjen
520d17f9db [Time Conductor] Test span constraints 
Verify that inner and outer spans do not become zero when
user input might otherwise cause this.
 2015-10-09 09:29:01 -07:00