ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-28 00:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,239 Commits 988 Branches 212 Tags 191 MiB
5a49ac16b1
Commit Graph

5239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Woeltjen
a143b21ea1 [Roots] Register roots with new API 
Register roots added via old API with new API when the application
starts. Fixes #1264.
 2016-10-19 15:01:39 -07:00
Victor Woeltjen
64ff463200 Revert "Revert "Async root registration"" 2016-10-19 14:55:07 -07:00
Andrew Henry
08ca7659e7 Merge pull request #1260 from nasa/open1257 
[Composition] Fix adapter composition policy
 2016-10-18 12:04:04 -07:00
Victor Woeltjen
d7edfb4cc6 Merge pull request #1263 from nasa/revert-1252-async-root-registration 
Revert "Async root registration"
 2016-10-18 10:52:42 -07:00
Victor Woeltjen
4eca80a770 Revert "Async root registration" 2016-10-18 10:48:26 -07:00
Andrew Henry
56a662841e Merge pull request #1254 from nasa/open1235 
[Frontend] Fixes to Export buttons
 2016-10-18 09:32:28 -07:00
Victor Woeltjen
8878ea4cf7 Merge pull request #1244 from nasa/restore-fixed-pos 
[API] Enable fixed position view
 2016-10-18 09:32:08 -07:00
Victor Woeltjen
eb32a798b8 Merge pull request #1252 from nasa/async-root-registration 
Async root registration
 2016-10-18 09:31:46 -07:00
Victor Woeltjen
0759ba6722 [Composition] Fix adapter composition policy 
...as this had fallen out-of-date with existing APIs.
Fixes #1257.
 2016-10-17 10:43:12 -07:00
Alex M
bfdf7b822f [Notifications] Cover direct dismiss and minimize 2016-10-16 15:34:11 +03:00
Alex M
7dde924fcc Merge branch 'master' into mct1221 2016-10-15 14:10:24 +03:00
Charles Hacskaylo
b8cb41b1da [Frontend] Fixes to export buttons 
Fixes #1235
Sass and markup mods; changes to
.l-btn-set and related classes
 2016-10-14 16:53:00 -07:00
Victor Woeltjen
971b92acbb Merge remote-tracking branch 'origin/master' into restore-fixed-pos 2016-10-14 13:53:26 -07:00
Pete Richards
d643efa9bb [Style] Remove unused function 
https://github.com/nasa/openmct/issues/1251
 2016-10-14 13:16:00 -07:00
Pete Richards
08c0aeb2d5 [Test] Add tests for root registration 
Add unit tests for RootRegistry and RootObjectProvider.

https://github.com/nasa/openmct/issues/1251
 2016-10-14 13:12:45 -07:00
Pete Richards
b0940eb33e [Objects] refactor out RootObjectProvider 
Refactor RootObjectProvider to separate file for simplicty.

https://github.com/nasa/openmct/issues/1251
 2016-10-14 12:47:09 -07:00
Pete Richards
6ec858b237 [Docs] Update root registration in README. 
https://github.com/nasa/openmct/issues/1251
 2016-10-14 12:38:52 -07:00
Pete Richards
891412bdb9 [Roots] Move my-items to separate bundle 
My Items root is now opt-in, and does not need to be enabled for all
deployments.  My Items is enabled by default in the development edition.

https://github.com/nasa/openmct/issues/1251
 2016-10-14 12:38:47 -07:00
Pete Richards
1947802a35 [ObjectAPI] support async root loading 
Overload addRoot method to support async root loading.  By supplying a
function you can defer loading to later, and by allowing those functions
to return a promise, execution can be asynchronous.

Remove "removeRoot" as the assumption will be that roots are opt in, and
instead of removing a Root, an application developer should never configure
it in the first place.

Fixes https://github.com/nasa/openmct/issues/1251
 2016-10-14 12:38:28 -07:00
Victor Woeltjen
3b06e32b40 Merge pull request #1250 from nasa/open1249 
[Documentation] Changed build location of docs so that API docs are pushed to website
 2016-10-14 10:57:51 -07:00
Henry
a2711c2c08 [Documentation] Changed build script to produce new API docs for website. Fixes #1249t 2016-10-13 16:27:35 -07:00
Victor Woeltjen
3e6c9fa318 Merge pull request #1247 from nasa/fix-built-file 
[Build] require correct module
 2016-10-12 15:25:37 -07:00
Pete Richards
2e49c5932a [Build] require correct module 
Require the openmct module so that distributed files work properly.

Related to #1212
 2016-10-12 15:21:57 -07:00
Pete Richards
abf750f894 Merge branch '1089-integration' 2016-10-12 14:43:45 -07:00
Henry
137434af1b [API] Enable fixed position view 2016-10-12 14:06:39 -07:00
Pete Richards
ac4d21b252 [Build] Load v2 conductor, don't enable 
Loads the v2 conductor so that it is included in the build openmct
file.  It is not enabled by default.
 2016-10-12 13:57:11 -07:00
Andrew Henry
db362a0efc Merge pull request #1243 from nasa/api-swg-enable 
[API] Enable example bundles
 2016-10-12 13:54:12 -07:00
Pete Richards
887631500b [Style] Remove duplicate key 
Remove duplicate entry, fix JSHint issues.
 2016-10-12 13:53:22 -07:00
Pete Richards
65043d0ff3 squash merge open933 into integration-1089, resolve merge conflicts. 2016-10-12 13:47:56 -07:00
Victor Woeltjen
1bf7c06b1e [API] Enable example bundles 
Enable example bundles in the default build. Addresses regression
in development environments introduced by #1212.
 2016-10-12 13:13:47 -07:00
Andrew Henry
7b218c7f02 Merge pull request #1212 from nasa/api-1124b 
[API] Integrate new API
 2016-10-12 12:33:44 -07:00
Andrew Henry
3572877a2e Merge pull request #1213 from nasa/api-platform-updates 
[API] Miscellaneous platform updates
 2016-10-12 12:28:52 -07:00
Andrew Henry
f2d44114fa Merge pull request #874 from nasa/persist-on-mutation-825 
[Persistence] Persist on mutation
 2016-10-11 10:52:44 -07:00
Alex M
d1d2067ad5 [Notifications] Extract autoDismiss logic 2016-10-08 22:51:01 +03:00
Alex M
9456370077 [Notifications] Extract minimize and dismiss logic 2016-10-08 21:36:31 +03:00
Victor Woeltjen
0833674b91 [Persistence] Address refactoring error 
...caught by unit tests
 2016-10-07 11:54:54 -07:00
Victor Woeltjen
947b54555a [Edit Mode] Simplify transaction stack 
https://github.com/nasa/openmct/pull/874#r76593588
 2016-10-07 11:35:35 -07:00
Victor Woeltjen
1a88c9a651 Merge remote-tracking branch 'origin/master' into persist-on-mutation-825 2016-10-07 11:27:58 -07:00
Victor Woeltjen
567bb6fa2a [API] Fix ActionDialogDecorator's dependencies 2016-10-07 11:10:41 -07:00
Victor Woeltjen
00d0b71080 [API] Use ViewRegistry from dialog adapter 
https://github.com/nasa/openmct/pull/1212#pullrequestreview-2458991
 2016-10-07 11:07:53 -07:00
Victor Woeltjen
580e10b024 [API] Only use strategy where needed 
Satisfies JSHint.
 2016-10-07 10:15:02 -07:00
Victor Woeltjen
fbe9621387 [API] Support telemetry request strategies 
https://github.com/nasa/openmct/pull/1212#discussion_r81880741
 2016-10-06 18:00:32 -07:00
Victor Woeltjen
13b5e7c00e [API] Remove toLegacyDefinition 
https://github.com/nasa/openmct/pull/1212#discussion_r81666469
 2016-10-06 17:50:01 -07:00
Victor Woeltjen
09d59f00e7 [API] Remove silly old comment 
https://github.com/nasa/openmct/pull/1212#discussion_r82086807
 2016-10-06 17:48:08 -07:00
Victor Woeltjen
772d24b173 [API] Avoid memory leak 
https://github.com/nasa/openmct/pull/1212#discussion_r81882955
 2016-10-06 17:46:26 -07:00
Victor Woeltjen
cbd001e280 Merge pull request #1232 from nasa/open1216 
[Tables] Fixed table scroll by modifying selection of scrollable element. Fixes #1216
 2016-10-06 17:41:54 -07:00
tylerbrewer2
6d2c5f7fd4 [Frontend] Ensure stacking order of save drop-down Fixes #1205 2016-10-06 18:49:21 -04:00
Ilya Bolkhovsky
1f6ca8bcc3 Merge branch 'master' of https://github.com/nasa/openmct into fix-tutorial 
PR is also addresses #1206
 2016-10-05 10:48:28 +03:00
Henry
bff4e120a7 [Tables] Modified selection of scrollable element. Fixes #1216 2016-10-04 19:14:47 -07:00
Victor Woeltjen
8a0018177a Merge pull request #1204 from BogdanAlexandru/mct1198 
[Edit] Switch other edit actions to mct-control
 2016-10-04 18:09:16 -07:00