99ec188813
Merge remote-tracking branch 'origin/open254'
2016-07-18 11:35:43 -07:00
41d0089e53
Merge remote-tracking branch 'origin/open1065'
2016-07-18 11:19:55 -07:00
8ed9f51008
Merge remote-tracking branch 'origin/open1075-fixed'
2016-07-18 11:17:05 -07:00
6176ca2260
Merge pull request #1084 from nasa/transaction-clearing-1059
...
[Persistence] Clear transactions selectively
2016-07-15 16:20:19 -07:00
4087b9cdde
[Frontend] Styling for Time Conductor v2
...
Fixes #933
WIP: Fixed look for Firefox
2016-07-15 14:39:29 -07:00
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
c5041db1d1
Merge pull request #1083 from nasa/contextualize-624
...
[Context] Remove excessive warnings
2016-07-15 11:05:52 -07:00
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
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
307b678707
[Fixed] Create new object type based on Telemetry Panel 'Fixed' view. Fixes #1075
2016-07-14 17:00:13 -07:00
550e60455b
[Persistence] Fix code style
2016-07-14 16:49:31 -07:00
d263b80810
[Persistence] Add TransactionManager JSDoc
...
Fixes #1059 (or, rather, concludes work on said fix)
2016-07-14 16:47:36 -07:00
671e3016d4
[Frontend] Styling for Time Conductor v2
...
Fixes #933
New _animations scss include, moved
scss around.
2016-07-14 16:40:05 -07:00
99227d2e42
[Persistence] Finish testing TransactionManager
2016-07-14 16:39:50 -07:00
379828315f
[Frontend] Styling for Time Conductor v2
...
Fixes #933
New _animations scss include, moved
scss around.
2016-07-14 16:39:27 -07:00
31264aadda
[Persistence] Begin testing TransactionManager
2016-07-14 16:28:27 -07:00
11a2fbacb4
[Persistence] Add test cases
...
Adds test cases for TransactionalPersistenceCapability which brings
coverage up to 100%.
2016-07-14 16:22:25 -07:00
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
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
1f7cece8ec
[Persistence] Remove unused variable
2016-07-14 15:05:43 -07:00
8c5538ec4d
[Frontend] Styling for Time Conductor v2
...
Fixes #933
"Sticky" clock anim for LAD mode
2016-07-14 14:58:18 -07:00
a731c35ad6
[Persistence] Refactor out transaction management
2016-07-14 13:43:55 -07:00
c7529dd56b
[Persistence] Share transaction clearing functions
2016-07-14 12:53:58 -07:00
00fff52529
[Persistence] Track persist-pending state globally
2016-07-14 12:50:36 -07:00
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
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
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
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
2f9fbfef7f
More refactoring
2016-07-13 20:33:47 -07:00
2baca659ca
Refactoring
2016-07-13 19:50:58 -07:00
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
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
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
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
14463d39a8
Added end delta
2016-07-13 18:17:27 -07:00
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
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
cd21575546
[Documentation] Minor punctuation change, and added links
2016-07-13 08:57:52 -07:00
f9d6b9fe5d
Merge pull request #1044 from pacozaa/master
...
[Documentation] Improve README.md in Build section
2016-07-13 08:50:29 -07:00
5238aa2731
[Frontend] Styling for Time Conductor v2
...
Fixes #933
In-progress; fixed SVG text color
2016-07-13 08:07:59 -07:00
407766774d
[Documentation] Add Building and Running Open MCT Locally Section from #1044 comment
2016-07-13 15:05:11 +07:00
c8898ac6aa
[Documentation] Updated copyright statement. Fixes #1081
2016-07-12 16:55:57 -07:00
fd29473664
Support resize
2016-07-12 15:02:39 -07:00
97f3fd516b
Changed default duration to fifteen minutes
2016-07-12 10:14:26 -07:00
088416905d
Added duration
2016-07-12 10:08:08 -07:00
2056d87453
Merge branch 'open933-frontend' into open933
2016-07-11 14:27:30 -07:00
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
585da38a16
Fixed some merge issues
2016-07-11 13:46:46 -07:00
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
bf0e85a94c
[Frontend] Styling for Time Conductor v2
...
Fixes #933
Renamed main class; removed unused <style>
defs
2016-07-11 11:35:26 -07:00
