ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-03 11:54:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,529 Commits 989 Branches 212 Tags 191 MiB
1650aae518
Commit Graph

4529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Woeltjen
10d2794bb7 [Locator] Don't reset root unnecessarily 
...as this will trigger a refresh of the mct-representation for
the tree, which will in turn create a new mct-tree instance,
resulting in any expanded/collapsed state being lost.

Fixes #1008.
 2016-08-19 13:28:56 -07:00
Victor Woeltjen
eb3b6e5eca Merge pull request #1129 from nasa/open1128 
[Documentation] Updated docs build script to push documentation to the correct directory on the website
 2016-08-19 12:44:11 -07:00
Henry
ccc32096ea [Documentation] Updated docs build script to push documentation to the correct directory on the website 2016-08-16 18:57:18 -07:00
Victor Woeltjen
4e5887d9ec [Tree] Check for change before scope.$apply 
TreeView's observers will be called when the selected domain object
changes, which can occur for one of two reasons:

1. Because a new value was set externally, from mct-tree.
2. Because a new value was selected, by the user.

In the latter case a $apply is needed, but in the former it is not
(and causes an error.) However, when that case occurs, the value in
scope will be up to date already (it was a watch that triggered the
call to treeView.value) so no assignment or $apply is necessary.

Fixes #1114.
 2016-08-15 16:04:14 -07:00
AbdelKader Bouadjadja
2167c061a2 No commented code on the github repository 2016-08-13 14:25:41 +04:00
Victor Woeltjen
2100c5717e [Build] Restore SNAPSHOT status 
...to open sprint Orwell,
https://github.com/nasa/openmct/milestones/Orwell
 2016-08-12 16:06:09 -07:00
Victor Woeltjen
acc1b8e207 [Build] Remove SNAPSHOT status 
...to close sprint Niven,
https://github.com/nasa/openmct/milestones/Niven
 2016-08-12 16:01:43 -07:00
Charles Hacskaylo
4ae6da0334 [Frontend] Data viz in Time Conductor smaller 
Fixes #933
Reduced height of data viz bar in Time Conductor
v2;
 2016-08-09 17:47:31 -07:00
Charles Hacskaylo
f3bd88837f Merge remote-tracking branch 'origin/master' into search1093-b 
Conflicts:
	platform/search/res/templates/search.html
 2016-08-08 17:51:39 -07:00
Charles Hacskaylo
8105a7edb8 Merge remote-tracking branch 'origin/master' into search1093-b 
Conflicts:
	platform/search/res/templates/search.html
 2016-08-08 17:51:25 -07:00
Charles Hacskaylo
ae39343b76 [Frontend] Fix for bad fix 
Fixes #1112
Put overflow: hidden back at
outer wrapper level (now on .t-object.primary-pane
) which doens't clip the Inspector expand/collapse;
did better unit testing;
 2016-08-08 12:14:20 -07:00
Charles Hacskaylo
62ee7e569b [Frontend] Fix for collapse Inspector button 
Fixes #1112
Moved min-width and overflow: hidden
to TC-specific elements; removed
overflow: hidden from .primary-pane
 2016-08-08 11:21:01 -07:00
Henry
7557a86208 Merge branch 'master' into open933 2016-08-05 16:37:36 -07:00
Victor Woeltjen
c8931f8535 [Tree] Simplify synchronization (#1100) 
Simplify synchronization of selection in tree with state
passed-in, letting Angular deal with more of the specifics.
Fixes #1008.
 2016-08-05 16:30:55 -07:00
Andrew Henry
0274490b68 [search] Reverted previous change to ClickAwayController and introduced a custom fix to search menu. Fixes #888 (#1109) 2016-08-05 16:30:20 -07:00
Pete Richards
46e644e6dc Use key to retrieve default 2016-08-05 14:44:18 -07:00
Pete Richards
af7954c5a1 Trigger digests when bounds are set 2016-08-05 11:24:51 -07:00
Henry
0e0ad64830 Fixed issue with wrong deltas being applied 2016-08-04 11:00:56 -07:00
Henry
f3fd386e3b Retain time system on mode change 2016-08-03 21:03:09 -07:00
Henry
25b9f371e2 Fixed loss of time system options on navigation 2016-08-03 20:16:03 -07:00
Henry
6b482d487b Merged mode-specific defaults, with some refactoring 2016-08-03 19:57:03 -07:00
Henry
f96f78ff79 Select appropriate tick source based on mode 2016-08-03 19:34:31 -07:00
Henry
579233ade9 Fixed delta format issue on navigation 2016-08-03 18:30:01 -07:00
Pete Richards
9a72c96ea4 [TCv2] different defaults by mode 2016-08-03 18:06:39 -07:00
Henry
f4e1879a2d stop listening to tick source on time system change 2016-08-03 17:43:07 -07:00
Henry
f844495cc1 Support deltaFormat on timeSystems 2016-08-03 17:40:37 -07:00
Pete Richards
900752208f [TCv2] get conductor without service 2016-08-03 13:11:22 -07:00
Henry
6501e2eb5f Added isUTCBased to TimeSystem interface 2016-08-03 13:09:54 -07:00
Henry
b9c41107c1 Time Conductor state retained on navigation 2016-08-02 22:18:44 -07:00
Charles Hacskaylo
06f2c74444 [Frontend] Minor search enhancements 
Fixes #1093
Finessed and cleaned up filters display
element; added '# results found' element;
 2016-08-02 15:57:43 -07:00
Henry
34c62ba405 Time Conductor in edit mode 2016-08-02 15:16:35 -07:00
Victor Woeltjen
4d89de7068 Merge pull request #1105 from nasa/readme-new-api 
[Documentation] Add mention of new API to README
 2016-08-02 15:04:32 -07:00
Charles Hacskaylo
2d50a63ca4 Merge remote-tracking branch 'origin/search1093' into search1093-b 
Conflicts:
	platform/search/res/templates/search.html
 2016-08-02 15:03:48 -07:00
Andrew Henry
54dcccb472 [Documentation] Add mention of new API to README 
Added two paragraphs to the readme mentioning the ongoing API work with a link to the tracking task. The website will also link to this.
 2016-08-02 14:37:32 -07:00
Henry
1eea5ce480 merged from master 2016-08-01 20:29:50 -07:00
Henry
4cd579d274 Pass numerical value to format functions 2016-08-01 20:16:46 -07:00
Charles Hacskaylo
11738286df [Frontend] Styling for unsynced elements 
Fixes #933
 2016-08-01 18:56:33 -07:00
Charles Hacskaylo
ca5206d4a0 [Frontend] Fixing issues with theme coloring 
Fixes #933
 2016-08-01 18:55:49 -07:00
Charles Hacskaylo
573f1f9f99 [Frontend] Hide zoom slider control 
Fixes #933
Temporarily hiding per request from Andrew
today;
 2016-08-01 18:04:17 -07:00
Charles Hacskaylo
c5c45f0a0e [Frontend] Update TC2 markup and sass 
Fixes #933
Update markup and sass in TC2 to be in line with
updates from master from #1047 glyphs
to cssclass approach;
 2016-08-01 18:01:28 -07:00
Henry
121ab413ff Apply formatting, filter modes by tick source availability 2016-08-01 17:51:15 -07:00
Charles Hacskaylo
753bd97c8a Merge remote-tracking branch 'origin/master' into open933-c 
# Conflicts:
#	platform/commonUI/edit/res/templates/create/create-menu.html
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
#	platform/commonUI/general/res/sass/_archetypes.scss
#	platform/commonUI/general/res/sass/_constants.scss
#	platform/commonUI/general/res/sass/_icons.scss
#	platform/commonUI/general/res/sass/_main.scss
#	platform/commonUI/general/res/sass/_mixins.scss
#	platform/commonUI/general/res/sass/controls/_buttons.scss
#	platform/commonUI/general/res/templates/controls/time-controller.html
#	platform/commonUI/themes/snow/res/sass/_constants.scss
 2016-08-01 17:12:44 -07:00
Henry
fcd7ab93e5 Merge branch 'open933' of https://github.com/nasa/openmctweb into open933 2016-08-01 17:12:00 -07:00
Charles Hacskaylo
c699cb8b4b Merge remote-tracking branch 'origin/master' into open933-c 
# Conflicts:
#	platform/commonUI/edit/res/templates/create/create-menu.html
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
#	platform/commonUI/general/res/sass/_archetypes.scss
#	platform/commonUI/general/res/sass/_constants.scss
#	platform/commonUI/general/res/sass/_icons.scss
#	platform/commonUI/general/res/sass/_main.scss
#	platform/commonUI/general/res/sass/_mixins.scss
#	platform/commonUI/general/res/sass/controls/_buttons.scss
#	platform/commonUI/general/res/templates/controls/time-controller.html
#	platform/commonUI/themes/snow/res/sass/_constants.scss
 2016-08-01 17:11:37 -07:00
Henry
a75ea67b8c Format updates when time system selected 2016-08-01 17:11:01 -07:00
Pete Richards
9b58aa0052 [TCv2] Add conductorService for compatibility 
Add conductor service for compatibility with old plugins that depend
on the conductor service.
 2016-08-01 17:03:00 -07:00
Charles Hacskaylo
579c6b6d24 [Frontend] Styling TC unsynced elements 
Fixes #933
WIP: Styling for unsynced elements
 2016-08-01 16:30:51 -07:00
Charles Hacskaylo
762f43fa61 [Frontend] Styling TC unsynced elements 
Fixes #933
WIP: Styling for unsynced elements
 2016-08-01 16:26:47 -07:00
Henry
ce5d0ef5bd Merged stylesheet changes 2016-08-01 16:16:38 -07:00
Henry
142ee2f336 Added LocalTimeSystem and merged latest styles 2016-08-01 15:44:49 -07:00