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

4517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Charles Hacskaylo
32f7bc86af [Frontend] Styling for Time Conductor v2 
Fixes #993
In-progress; class renaming continued,
cleanups in markup file, in-page styles
ported to scss
 2016-07-08 16:54:13 -07:00
Henry
e230b92946 Fixed bug with date selector having to be clicked twice 2016-07-08 15:15:12 -07:00
Henry
58ed500ecf Time sync via conductor 2016-07-07 16:57:03 -07:00
Henry
bca5eb0fdb [Time Conductor] #933 Initial markup 2016-07-07 09:47:46 -07:00
Henry
59e18b9a79 [Search] Amended ClickAwayController to trigger digest via instead of . Fixes #1065 2016-06-30 14:44:39 -07:00
Henry
ea1780364b [Dialog Service] Dismiss individual dialogs. Fixes #254 2016-06-29 20:12:12 -07:00
pacozaa
eef08ccb0b [Documentation]Add convince messages 2016-06-28 13:05:28 +07:00
pacozaa
8a9edd3705 [Documentation] Add Official site 2016-06-28 12:51:12 +07:00
Pete Richards
652a50c700 Merge remote-tracking branch 'origin/open1018-new' 2016-06-27 09:13:03 -07:00
Victor Woeltjen
d1c01d3c86 Squashed commit of the following: 
commit 3f199a9f06
Merge: 27fe4ed 736cba7
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Mon Jun 27 09:04:40 2016 -0700

    Merge remote-tracking branch 'origin/master' into clear-transactions-1046

    Conflicts:
    	platform/commonUI/edit/src/actions/SaveAsAction.js

commit 27fe4edb30
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 15:04:06 2016 -0700

    [Edit] Mark restartTransaction as private API

commit 21d1938a0f
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 15:03:17 2016 -0700

    [Edit] Clarify JSDoc

commit 06a83f9fa9
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 15:01:35 2016 -0700

    [Edit] Update failing spec

commit 1f525160e0
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 14:52:43 2016 -0700

    [Edit] Refer to correct variable

    ...when clearing transactions after a restartTransaction

commit b60e94bce4
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 14:38:54 2016 -0700

    [Edit] Clear transactions on Save As

    ...such that only persistence calls associated with the
    saved clones are actually issued. Fixes #1046.
 2016-06-27 09:12:57 -07:00
Sarin
8cf7ffc7cc [Documentation] Add How is NASA Using Open MCT?, Features, See Open MCT in Action, Getting Started Sections 2016-06-27 17:11:27 +07:00
Sarin
b57fc2a0e3 [Documentation] Add getting started section 2016-06-27 16:51:55 +07:00
Victor Woeltjen
736cba76bb Merge pull request #1056 from nasa/blocking-save-dialog 
[Save] Show blocking dialog
 2016-06-26 11:07:03 -07:00
Andrew Henry
2339560363 [Time Conductor] Bounds updated when date selected from date selector. Fixes #1018 2016-06-24 21:50:59 -07:00
Pete Richards
24e870a126 [Save] Show blocking dialog 
Show a blocking dialog while the save action is being performed.

Prevents users from pressing save a second time or performing
further actions while a save is in progress.

Fixes https://github.jpl.nasa.gov/MissionControl/vista/issues/362
 2016-06-24 20:01:52 -07:00
Victor Woeltjen
8bdf1e3072 [Build] Bump version number 
...and restore SNAPSHOT status, to begin sprint Le Guin,
https://github.com/nasa/openmct/milestones/Le%20Guin
 2016-06-24 15:42:10 -07:00
Victor Woeltjen
e8e9598721 [Build] Remove SNAPSHOT status 
...to close sprint Kress,
https://github.com/nasa/openmct/milestones/Kress
 2016-06-24 15:37:23 -07:00
Andrew Henry
ce87ad2564 Merge pull request #916 from ev1stensberg/patch-2 
[Branding] Added Apache license to README.md
 2016-06-23 11:43:16 -07:00
Andrew Henry
2a2f6e8142 Merge pull request #915 from ev1stensberg/patch-1 
[Functionality] Log app instance to the console
 2016-06-23 11:24:53 -07:00