ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-15 17:30:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,623 Commits 993 Branches 212 Tags 192 MiB
547696d797
Commit Graph

3767 Commits

Author SHA1 Message Date
Alex M
d63c401e44 [Notifications] Remove custom autoDismiss 2016-10-29 11:18:07 +03:00
Alex M
c9ac85089a Merge branch 'master' into mct1221 2016-10-29 10:41:18 +03:00
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
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
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
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
64ff463200 Revert "Revert "Async root registration"" 2016-10-19 14:55:07 -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
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
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
65043d0ff3 squash merge open933 into integration-1089, resolve merge conflicts. 2016-10-12 13:47:56 -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
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
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
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
Victor Woeltjen
c9c8998fa2 Merge pull request #1196 from hudsonfoo/open1185 
[Timeline] Add battery starting state-of-charge
 2016-10-04 18:06:50 -07:00
Alex M
e19edbb27a Merge branch 'master' into mct1221 2016-10-03 04:50:41 +03:00
Alex M
f2fe6a9885 [Notification] New tests + bugfix 
New test suite for the notification service covering common use cases. Fixed the bug where autoDismiss would be set wrong for info notifications; also treating info notifications appropriately now.
 2016-10-03 04:19:55 +03:00
Alex M
0442a31153 [Notification] Rename variables for clarity 
In the spec: NotificationService knows about concepts like "info", "alert" and "error" only, having a plain info notification model called successModel doesn't help much and may be confusing at times (makes you think it's something the service treats separately).
 2016-10-02 23:41:19 +03:00
Alex M
e03c725b86 [Style] Minor style changes 2016-10-01 22:40:21 +03:00
Pete Richards
ae6f6565fa [export] remove pdf export 
Remove pdf export with extreme prejudice due to issues with build process.

Fixes https://github.com/nasa/openmct/issues/1217
 2016-09-30 16:54:42 -07:00
David Hudson
e077f9ee18 [Timeline] Fix logic error 
Issue #1185. Also removed direct modification of domain object.
 2016-09-30 21:34:03 +02:00
David Hudson
e9f4db7719 Merge branch 'master' of github.com:nasa/openmct into open1185 2016-09-30 21:25:36 +02:00
Victor Woeltjen
34e07b938d [API] Update StyleSheetLoaderSpec 
...to reflect asset path details
 2016-09-30 10:42:48 -07:00
Victor Woeltjen
230230aa94 [API] Remove js extension from import 
...to avoid confusing RequireJS and breaking test suite
 2016-09-30 10:37:31 -07:00
Victor Woeltjen
901846e6c1 [API] Use correct property for RT table template 2016-09-30 10:29:03 -07:00
Victor Woeltjen
a93f41f1c3 [API] Miscellaneous platform updates 
Adds miscellaneous platform updates to include templates
via the RequireJS text plugin; to support modification of
asset paths; and to support priority order for gestures.

Supports integration of new API, #1124.
 2016-09-30 10:25:22 -07:00
Victor Woeltjen
7d950d067c Merge pull request #1194 from hudsonfoo/open1184 
[Frontend] Add notes property to all item types
 2016-09-27 15:28:49 -07:00
Alex M
a34e89d56a [Edit] Bind action to .perform() inside mct-button 2016-09-27 21:19:25 +03:00
Alex M
4b51e604a7 [Edit] Switch other edit actions to mct-control 2016-09-24 20:43:35 +03:00
Andrew Henry
e3e7bd27e9 Merge pull request #1203 from nasa/open1202 
[Frontend] Removed Export buttons from objects when in a Layout
 2016-09-23 10:20:47 -07:00
Andrew Henry
f6ed0e8ab6 Merge pull request #1178 from hudsonfoo/open1168 
[Frontend] Delay visibility of progress bar
 2016-09-23 10:10:09 -07:00
Henry
98f387b605 [Edit Mode] Renamed function from EditAction.cancel() to EditAction.finish() 2016-09-22 17:34:53 -07:00
Henry
275dda820b Merge branch 'mct588comm' of https://github.com/BogdanAlexandru/openmct into BogdanAlexandru-mct588comm 2016-09-22 17:33:42 -07:00
Henry
7a94efccbf [Edit Mode] Fixed spelling mistake, moved variable declaration 2016-09-22 11:04:04 -07:00
Charles Hacskaylo
3c72eea9ef [Frontend] Removed export buttons from objects when in layout 
Fixes #1202
CSS modded
 2016-09-22 10:41:14 -07:00