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

4755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pete Richards
8cacff37ab Merge pull request #1292 from nasa/my-items-1284 
[Roots] Restore legacy root provider
 2016-10-26 10:24:24 -07:00
Victor Woeltjen
70985c5dbd Revert "[Roots] Remove obsolete provider" 
This reverts commit b49fef78f5.

Fixes #1284
 2016-10-26 10:09:10 -07:00
Victor Woeltjen
9dec99824e Revert "[Roots] Remove obsolete spec" 
This reverts commit 2cced53c97.
 2016-10-26 10:08:35 -07:00
Victor Woeltjen
d4730e1656 Revert "[Roots] Remove legacy root model provider" 
This reverts commit 7b0506bbdb.
 2016-10-26 10:08:30 -07:00
Victor Woeltjen
c079868224 Merge pull request #1271 from nasa/open1256 
[Examples] Simplified MSL example and fixed issues with new API
 2016-10-26 09:55:18 -07:00
Victor Woeltjen
54a59c5e6f Merge pull request #1237 from tylerbrewer2/master 
[Frontend] Ensure stacking order of save drop-down Fixes #1205
 2016-10-26 09:54:37 -07:00
Pete Richards
0804a16314 Merge pull request #1269 from nasa/my-items-1264 
[Roots] Support async root registration, with My Items
 2016-10-21 13:34:23 -07:00
Henry
4cc020f0ea [Examples] Simplified MSL example, fixed object tree not loading by default, renamed. Fixes #1256. Fixes #1255 2016-10-20 14:33:12 -07:00
Victor Woeltjen
b49fef78f5 [Roots] Remove obsolete provider 2016-10-19 17:02:12 -07:00
Victor Woeltjen
2cced53c97 [Roots] Remove obsolete spec 2016-10-19 16:54:26 -07:00
Victor Woeltjen
f6253ae7ed [Roots] Remove unnecessary model provider 2016-10-19 16:53:03 -07:00
Victor Woeltjen
3f50bdb334 [Roots] Distinguish objects.get 
...which needs to accept full identifiers from namespace-specific
object providers, which only need to accept keys.
 2016-10-19 16:47:11 -07:00
Victor Woeltjen
2a79813460 [Roots] Remove unnecessary RootRegistrar 2016-10-19 16:37:10 -07:00
Victor Woeltjen
650824574c [Roots] Add new root model provider 
...to read roots from the new API's registry.
 2016-10-19 16:20:02 -07:00
Victor Woeltjen
7b0506bbdb [Roots] Remove legacy root model provider 2016-10-19 16:19:11 -07:00
Victor Woeltjen
a3847bcca5 [Roots] Add useful logging for components 2016-10-19 16:18:50 -07:00
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