Commit Graph

4586 Commits

Author SHA1 Message Date
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
Henry
fd29473664 Support resize 2016-07-12 15:02:39 -07:00
Henry
97f3fd516b Changed default duration to fifteen minutes 2016-07-12 10:14:26 -07:00
Henry
088416905d Added duration 2016-07-12 10:08:08 -07:00
Henry
2056d87453 Merge branch 'open933-frontend' into open933 2016-07-11 14:27:30 -07:00
Charles Hacskaylo
64ce8a2b2a [Frontend] Styling for Time Conductor v2
Fixes #933
Color adjusts, mini super-menu size
and font tweaks, glyphs added to selector,
SVG style fixes in progress
2016-07-11 14:03:41 -07:00
Henry
585da38a16 Fixed some merge issues 2016-07-11 13:46:46 -07:00
Pete Richards
d05a1cef9b Merge pull request #1060 from nasa/clear-transactions-1046-squashed
[Edit] Clear transactions on Save As
2016-07-11 12:25:09 -07:00
Charles Hacskaylo
bf0e85a94c [Frontend] Styling for Time Conductor v2
Fixes #933
Renamed main class; removed unused <style>
defs
2016-07-11 11:35:26 -07:00
Charles Hacskaylo
84b7a9dc2f Merge remote-tracking branch 'origin/open933' into open933-frontend
Fixes #933
Conflicts:
	platform/features/conductor-v2/src/TimeConductorController.js
2016-07-11 11:29:35 -07:00
Henry
11caa8396a Updated modes 2016-07-11 11:18:23 -07:00
Henry
0017b77439 Merged markup changes 2016-07-11 11:06:22 -07:00
Charles Hacskaylo
7b7b21d748 [Frontend] Styling of Time Conductor v2
Fixes #933
Tweaks to language; tweak to class name in markup
2016-07-11 11:05:47 -07:00
Charles Hacskaylo
788483ec13 [Frontend] Styling of Time Conductor v2
Fixes #933
Tweaks to language
2016-07-11 10:37:08 -07:00
Charles Hacskaylo
7b19f91ce6 [Frontend] Merge latest from open933
Fixes #933
Resolve conflicts in
mode-menu.html, mode-selector.html,
time-conductor.html; apply tweaks, language, etc.
2016-07-11 10:31:14 -07:00
Henry
5cc81ba12a [Time Conductor] Added mode class to time conductor 2016-07-11 10:26:34 -07:00
pacozaa
12b5544959 [Documentation] Edit as Reqeust in #1044 comment 2016-07-09 20:49:05 +07:00
Charles Hacskaylo
0a0bc55f5f [Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; mode menu names and
descriptors modified, markup cleaned up
2016-07-08 17:11:43 -07:00
Henry
4e7b69c4df Enabled fixed and real-time modes 2016-07-08 16:57:50 -07:00
Charles Hacskaylo
cf83040c4b [Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; Create menu refactoring and new
mini Create menu
2016-07-08 16:54:49 -07:00