Commit Graph

4782 Commits

Author SHA1 Message Date
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
Andrew Henry
156ba832f2 Merge pull request #1154 from nasa/root-build-note-1151
[README] Warn about root installation issues
2016-09-16 13:36:35 -07:00
Andrew Henry
c4f079dde2 Merge pull request #1191 from nasa/revert-1134-dep-vuln-1130
[Build] Revert check dependencies for vulnerabilities
2016-09-16 13:35:35 -07: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
Alex M
31ee92b711 [Edit] Remove editor.cancel from SaveActionSpec 2016-09-15 20:39:02 +03:00
Alex M
1ea7fa3084 [Edit] SaveAsAction tests cover save and finish 2016-09-15 20:28:29 +03:00
Victor Woeltjen
fe217384aa Merge pull request #1192 from nasa/revert-1159-squashed_proxy_parameters
Revert "[proxyUrl] pass URL parameters to proxied URL"
2016-09-15 10:13:42 -07:00
Pete Richards
49d2d5500f Revert "[proxyUrl] pass URL parameters to proxied URL" 2016-09-15 09:37:11 -07:00
Victor Woeltjen
c1afc34cfc Revert "[Build] Check dependencies for vulnerabilities" 2016-09-14 10:16:33 -07:00
Alex M
d8dc3c8445 Merge branch 'master' into mct588comm 2016-09-14 19:50:19 +03:00
David Hudson
ea1855fc26 Merge branch 'master' of github.com:nasa/openmct into open1168 2016-09-14 17:00:06 +09:00
Alex M
0be84a4e51 [Edit] CreateAction closes editor after save 2016-09-13 23:59:28 +03:00
Alex M
d87ed1414e [Edit] Update EditorCapability comments 2016-09-13 22:36:27 +03:00
Alex M
4382745012 [Edit] Final two actions now use finish() 2016-09-13 22:35:11 +03:00
Pete Richards
f73238787d Merge pull request #1190 from nasa/build-promise-1183
[Build] Update to es6-promise 3.3.0
2016-09-13 12:08:42 -07:00
Victor Woeltjen
8c04596859 Merge pull request #1179 from BogdanAlexandru/controlsdocs
[Documentation] Add extra controls to developer guide
2016-09-13 11:29:28 -07:00
Alex M
79b16ddda6 [Edit] SaveAs now calls finish() 2016-09-13 21:24:20 +03:00
Victor Woeltjen
d490693bad [Build] Update to es6-promise 3.3.0
...including changes to filename associated with that version.

Fixes #1183
2016-09-13 11:20:58 -07:00
David Hudson
6c9bd0b510 Merge branch 'master' of github.com:nasa/openmct into open1168 2016-09-13 16:39:31 +09:00
David Hudson
2740b6f957 [Frontend] Add optional delay parameter to dialog service
Issue #1168
2016-09-13 16:36:25 +09:00
Alex M
37cf56a2b3 [Documentation] Add extra controls 2016-09-13 00:53:50 +03:00
Victor Woeltjen
e73bb4ff4a Merge pull request #1164 from hudsonfoo/open967
[Enhancement] Export plot as PDF, JPG, or PNG
2016-09-12 10:56:09 -07:00
David Hudson
ea35395d7e Merge branch 'master' of github.com:nasa/openmct into open1168 2016-09-13 02:47:16 +09:00
David Hudson
bad901a162 [Typo] Add reference to self
Issue #967
2016-09-12 17:06:23 +09:00
David Hudson
bb34528a86 [Testing] Add tests to ensure correct image type
Issue #967
2016-09-12 17:00:28 +09:00
David Hudson
487ec7907c [Formatting] Fix missing space
Issue #967
2016-09-12 16:59:39 +09:00
David Hudson
3093ab8067 [Testing] Convert blob to proper format. Inject FileReader.
Issue #967
2016-09-12 16:58:21 +09:00
David Hudson
0f1d685ae6 Merge branch 'master' of github.com:nasa/openmct into open967 2016-09-12 15:46:04 +09:00
David Hudson
24cb72e5b5 [Frontend] Delay visibility of progress bar
Resolves #1168
2016-09-12 15:28:04 +09:00
Andrew Henry
4c6ca58c95 Merge pull request #1157 from TypicalFooBar/843
[Context Menu] New Tab button available in edit mode. #843
2016-09-11 21:21:49 -07:00
David Hudson
d62989bc5d [Formatting] Rename export image service key
Issue #1164
2016-09-10 03:18:46 +09:00
David Hudson
8e39da6726 [Formatting] Rename export image service key
Issue #1164
2016-09-10 03:12:00 +09:00
David Hudson
98deac042e [Formatting] Reduce line length of gl declaration
Issue #1164
2016-09-10 02:56:23 +09:00
David Hudson
b51ffcada6 [Formatting] Add inline JSDoc
Issue #1164
2016-09-10 01:59:07 +09:00
David Hudson
a6386b1612 [Formatting] Rename export image service variables
Issue #1164
2016-09-10 01:45:50 +09:00
David Hudson
72ecbb0abc [Frontend] Fix typo 2016-09-09 12:07:02 +09:00
David Hudson
c6caae8647 [Frontend] Remove unnecessary export button styles 2016-09-09 12:06:42 +09:00
David Hudson
da23bba392 Merge branch 'master' of github.com:nasa/openmct into open967 2016-09-09 12:02:50 +09:00
Victor Woeltjen
32e7f57a7c [Build] Accept future phantomjs versions 2016-09-08 13:48:53 -07:00
Victor Woeltjen
f7dfccb096 [Build] Depend on phantomjs-prebuilt 2.1.11
...due to issues installing 2.1.12 on Linux. Fixes #1176.
2016-09-08 13:41:51 -07:00
David Hudson
990c653397 Merge branch 'open967' of github.com:hudsonfoo/openmct into open967 2016-09-08 11:06:05 +09:00
David Hudson
911ece7612 [Frontend] Remove styles that are no longer necessary
Issue #1164. Based on updates from 0457f7bee8 these styles
are no longer necessary and have been removed.
2016-09-08 11:05:19 +09:00
David Hudson
222b4421e5 [Frontend] Remove styles that are no longer necessary
Based on updates from 0457f7bee8 these styles
are no longer necessary and have been removed.
2016-09-08 11:03:36 +09:00
Charles Hacskaylo
4517bd1356 [Frontend] New markup for CSS from #1166
Fixes #967
Requires new styles implemented in #1166

(cherry picked from commit 0457f7bee8)
2016-09-08 11:02:42 +09:00