ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-25 15:51:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,355 Commits 989 Branches 212 Tags 191 MiB
f3fd386e3b
Commit Graph

4355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henry
2a19394334 Added compatibility layer to support existing plots and historical tables 2016-07-19 19:54:52 -07:00
Charles Hacskaylo
f641edbce7 [Frontend] Renew support for Time Conductor v1 
Fixes #933
Time Conductors v1 and v2 now build and load their
own isolated CSS files. All previous styling for TCv1
should be re-enabled. Note that Conductor v2 mobile
is not complete yet.
 2016-07-19 18:33:24 -07:00
Henry
15a608a861 Populate format in input fields 2016-07-18 18:44:29 -07:00
Henry
334ca64551 Merged open933-frontend 2016-07-18 14:25:02 -07:00
Henry
0af49efe06 Refactored out modes, time systems, etc. 2016-07-18 12:49:44 -07:00
Pete Richards
14f1a1f740 Merge remote-tracking branch 'origin/open1031' 2016-07-18 11:43:55 -07:00
Pete Richards
5a6c209369 Merge branch 'jesusprubio-open1036' 2016-07-18 11:39:04 -07:00
Pete Richards
8c2ce81b76 Merge branch 'open1036' of https://github.com/jesusprubio/openmct into jesusprubio-open1036 2016-07-18 11:37:00 -07:00
Pete Richards
99ec188813 Merge remote-tracking branch 'origin/open254' 2016-07-18 11:35:43 -07:00
Pete Richards
41d0089e53 Merge remote-tracking branch 'origin/open1065' 2016-07-18 11:19:55 -07:00
Pete Richards
8ed9f51008 Merge remote-tracking branch 'origin/open1075-fixed' 2016-07-18 11:17:05 -07:00
Andrew Henry
6176ca2260 Merge pull request #1084 from nasa/transaction-clearing-1059 
[Persistence] Clear transactions selectively
 2016-07-15 16:20:19 -07:00
Charles Hacskaylo
4087b9cdde [Frontend] Styling for Time Conductor v2 
Fixes #933
WIP: Fixed look for Firefox
 2016-07-15 14:39:29 -07:00
Victor Woeltjen
eb6ddb5e45 [Persistence] Use ids from TransactionManager API 
Recommended during code review,
https://github.com/nasa/openmct/pull/1084#discussion_r71021889
 2016-07-15 12:26:35 -07:00
Andrew Henry
c5041db1d1 Merge pull request #1083 from nasa/contextualize-624 
[Context] Remove excessive warnings
 2016-07-15 11:05:52 -07:00
Charles Hacskaylo
43a804eef4 [Frontend] Styling for Time Conductor v2 
Fixes #933
WIP: Added zoom current range indicator;
tweaks to style
 2016-07-15 07:54:32 -07:00
Charles Hacskaylo
b3a4f52fe2 [Frontend] Styling for Time Conductor v2 
Fixes #933
WIP: Adding zoom control with HTML5
input range type; Refactored sass slightly
to move display: inline-block out of mixin
containerBase and into .s-btn.
 2016-07-14 18:30:49 -07:00
Henry
307b678707 [Fixed] Create new object type based on Telemetry Panel 'Fixed' view. Fixes #1075 2016-07-14 17:00:13 -07:00
Victor Woeltjen
550e60455b [Persistence] Fix code style 2016-07-14 16:49:31 -07:00
Victor Woeltjen
d263b80810 [Persistence] Add TransactionManager JSDoc 
Fixes #1059 (or, rather, concludes work on said fix)
 2016-07-14 16:47:36 -07:00
Charles Hacskaylo
671e3016d4 [Frontend] Styling for Time Conductor v2 
Fixes #933
New _animations scss include, moved
scss around.
 2016-07-14 16:40:05 -07:00
Victor Woeltjen
99227d2e42 [Persistence] Finish testing TransactionManager 2016-07-14 16:39:50 -07:00
Charles Hacskaylo
379828315f [Frontend] Styling for Time Conductor v2 
Fixes #933
New _animations scss include, moved
scss around.
 2016-07-14 16:39:27 -07:00
Victor Woeltjen
31264aadda [Persistence] Begin testing TransactionManager 2016-07-14 16:28:27 -07:00
Victor Woeltjen
11a2fbacb4 [Persistence] Add test cases 
Adds test cases for TransactionalPersistenceCapability which brings
coverage up to 100%.
 2016-07-14 16:22:25 -07:00
Victor Woeltjen
7c865f87be [Persistence] Update transactional persistence spec 
...to account for changes to separate out transaction management,
including removal of specs made obsolete (as tested behavior has
been moved to TransactionManager or was already redundant to
behavior from the undecorated PersistenceCapability)
 2016-07-14 16:20:29 -07:00
Victor Woeltjen
86fcf19066 [Persistence] Update Save As spec 
...to account for asynchrony in test case due to usage of
Promise.all
 2016-07-14 16:14:20 -07:00
Victor Woeltjen
1f7cece8ec [Persistence] Remove unused variable 2016-07-14 15:05:43 -07:00
Charles Hacskaylo
8c5538ec4d [Frontend] Styling for Time Conductor v2 
Fixes #933
"Sticky" clock anim for LAD mode
 2016-07-14 14:58:18 -07:00
Victor Woeltjen
a731c35ad6 [Persistence] Refactor out transaction management 2016-07-14 13:43:55 -07:00
Victor Woeltjen
c7529dd56b [Persistence] Share transaction clearing functions 2016-07-14 12:53:58 -07:00
Victor Woeltjen
00fff52529 [Persistence] Track persist-pending state globally 2016-07-14 12:50:36 -07:00
Victor Woeltjen
4c7ad6d93a Merge branch 'undirty-on-refresh-1046' into transaction-clearing-1059 
Conflicts:
	platform/commonUI/edit/src/actions/SaveAsAction.js
 2016-07-14 11:53:39 -07:00
Victor Woeltjen
eb5493e37b [Persistence] Revert quick-fix for persistence clearing 
Revert "Squashed commit of the following:"

This reverts commit d1c01d3c86.
 2016-07-14 11:51:59 -07:00
Victor Woeltjen
1fb18c7919 [Context] Add test, tweak logic 
Add test to verify that warnings are not shown based on
composition/location inconsistencies when editing.
 2016-07-14 11:16:07 -07:00
Victor Woeltjen
1c2378b3b4 [Context] Suppress warnings while editing 
Don't expect consistency between composition and location fields
while an object is being edited; this avoids benign warnings
being logged. Fixes #624
 2016-07-14 11:10:15 -07:00
Henry
2f9fbfef7f More refactoring 2016-07-13 20:33:47 -07:00
Henry
2baca659ca Refactoring 2016-07-13 19:50:58 -07:00
Charles Hacskaylo
8b694ef337 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: color/size tweaks, fixes for espresso
theme
 2016-07-13 19:42:51 -07:00
Charles Hacskaylo
e193e3dfba Merge open933 latest, resolve conflicts 
Fixes #933
Fair amount of manual fixing in time-conductor.html
 2016-07-13 19:16:27 -07:00
Charles Hacskaylo
8214c8e895 Merge open933 latest, resolve conflicts 
Fixes #933
Fair amount of manual fixing in time-conductor.html
 2016-07-13 19:16:00 -07:00
Charles Hacskaylo
33b2225d10 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: restructured markup to move
modeModel farther out; animated icon
 2016-07-13 18:48:17 -07:00
Henry
14463d39a8 Added end delta 2016-07-13 18:17:27 -07:00
Charles Hacskaylo
fcfda50e73 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: color tweaks, bar sizing,
field widths
 2016-07-13 15:00:16 -07:00
Charles Hacskaylo
06af84c161 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: fixed SVG text color, field
styling for fixed vs. real-time, markup cleanup
 2016-07-13 13:14:32 -07:00
Andrew Henry
cd21575546 [Documentation] Minor punctuation change, and added links 2016-07-13 08:57:52 -07:00
Andrew Henry
f9d6b9fe5d Merge pull request #1044 from pacozaa/master 
[Documentation] Improve README.md in Build section
 2016-07-13 08:50:29 -07:00
Charles Hacskaylo
5238aa2731 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress; fixed SVG text color
 2016-07-13 08:07:59 -07:00
pacozaa
407766774d [Documentation] Add Building and Running Open MCT Locally Section from #1044 comment 2016-07-13 15:05:11 +07:00
Henry
c8898ac6aa [Documentation] Updated copyright statement. Fixes #1081 2016-07-12 16:55:57 -07:00