Commit Graph

3742 Commits

Author SHA1 Message Date
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
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
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
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
Henry
3548cde9c4 [Edit Mode] Fixed issue with save dialog not being displayed for new objects after mutation. Fixes 1080 2016-09-21 16:12:09 -07:00
David Hudson
3d17435438 [Test] Update spec to use SOC percentage 2016-09-20 17:42:34 +09:00
David Hudson
f185254114 [Formatting] Fix missing spaces 2016-09-20 17:41:45 +09:00
David Hudson
943e2ebe14 [Timeline] Convert SOC to use percentages
Also includes updated validation params which allow for floats to a maximum
of 100 as well as a percentage sign which is later removed.
2016-09-20 17:40:08 +09:00
Alex M
0c27a5f361 [Edit] Remove CreationService dep from SaveAs 2016-09-19 23:52:30 +03:00
Alex M
abfabc85b5 [Edit] Fix edit-action-buttons indent 2016-09-19 20:41:50 +03:00
Alex M
e08704e6d3 [Edit] Make checkstyle happy 2016-09-19 20:39:54 +03:00
Alex M
f60fc2ebad [Edit] EditorCapability.finish returns domainObj 2016-09-19 20:33:12 +03:00
Alex M
b50278e92f [Edit] Remove mocked unused UrlService 2016-09-19 20:22:46 +03:00
David Hudson
d913798d5b [Timeline] Add battery starting state-of-charge
Issue #1185
2016-09-18 22:52:41 +09:00
David Hudson
56267095cb [Forms] Add style for small textareas
Issue #1184. This allows for a generically sized text area in forms. I am
anticipating some potential feedback on this given the approach and the sizing
I chose may or may not be ideal for your requirements.
2016-09-18 01:47:07 +09:00
David Hudson
f9ce27def3 [Frontend] Add attributes for storing notes
Issue #1184
2016-09-18 01:27:12 +09:00
David Hudson
4429e847e8 [Properties] Add notes field to all item types
Issue #1184
2016-09-18 01:18:26 +09:00
David Hudson
56e321f6d9 [Forms] Add textarea template
Issue #1184
2016-09-18 01:18:02 +09:00
David Hudson
e135ed26f0 [Frontend] Shorten overlay fade duration
Issue #1168
2016-09-17 16:36:55 +09:00
David Hudson
48b25fe842 [Formatting] Remove double negative logic
Issue #1168
2016-09-17 16:32:26 +09:00
Alex M
5ef6617062 [Edit] Rename action to Save and Finish Editing 2016-09-17 01:05:46 +03:00
Alex M
ae89dcd62d [Edit] Make single save button use mct-control 2016-09-17 00:39:49 +03:00
steven mirecki
f9597fe799 Merge branch 'master' of https://github.com/nasa/openmct 2016-09-16 17:16:35 -04:00
smirecki
0ec27350e0 Update TimelineTickController.js
One correction by @akhenry, "region, not reign".
2016-09-16 16:50:11 -04:00
Alex M
2a2e9ef99d [Edit] Make linter happy 2016-09-16 03:24:00 +03:00
Alex M
1446b16e77 [Edit] Using spy objects as save action mocks 2016-09-16 03:15:10 +03:00
Alex M
f03003b366 [Edit] Fix CreateActionSpec 2016-09-15 23:18:53 +03:00
Alex M
d3db26499c [Edit] CreateAction needs to perform("save-as") 2016-09-15 23:14:12 +03:00
Alex M
d1f67fd8b9 [Edit] Introduce dropdown Save menu
And fix style issues in SaveAsActionSpec
2016-09-15 22:40:02 +03:00