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

4406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Henry
e0b6986851 Merge pull request #1169 from smirecki/master 
[Documentation] Typo corrections
 2016-09-19 09:52:48 -07: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
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
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
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
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
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
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
David Hudson
5984ae46fc Merge branch 'master' of github.com:nasa/openmct into open967 2016-09-08 10:50:08 +09:00
Victor Woeltjen
5bde1de61b Merge pull request #1167 from nasa/open1166 
Review and integrate generalized control-bar styling for views
 2016-09-07 13:37:10 -07:00
Andrew Henry
06d229ea99 Merge pull request #1133 from charbelrami/markup 
[Frontend] Tweak markup
 2016-09-07 13:16:04 -07:00
Andrew Henry
58391de007 Merge pull request #1150 from aterribili/patch-1 
Add .swp to git ignore
 2016-09-05 09:58:28 -07:00
David Hudson
ceb3e8e3dd [Enhancement] Add IE, Opera, Safari support for canvas.toBlob() 
This is currently being used for exporting plots to PNG/JPG.
 2016-09-05 19:40:22 +09:00
David Hudson
35a331f3fd [Frontend] Fix plot image cutoff on export 
The images were being cutoff due to the "top" attribute of .gl-plot
not changing when the buttons were hidden. The buttons are now
hidden by CSS class rather than ng-show, which makes updating the
.gl-plot top attribute easier.
 2016-09-05 17:02:04 +09:00
David Hudson
7d13ce0626 [Licenses] Add license information for html2canvas, jsPDF, saveAs 2016-09-05 01:22:43 +09:00
David Hudson
a49eebf9f5 [Testing] Add test spec for ExportImageService 2016-09-04 23:04:46 +09:00
David Hudson
989e4e1b75 [Testing] Add jsPDF, html2canvas, and saveAs as injectible dependencies 
I would prefer this be passed in via the bundle, but it continues to fail
saying "Unknown Provider". I have chosen to require them into the module
the old-fashioned way, then allow an injectible dependency to override.
 2016-09-04 23:02:23 +09:00
David Hudson
9bb647e275 [Testing] Add better dependency injection and error handling 2016-09-04 19:19:14 +09:00
steven mirecki
e751461194 Typo corrections, I avoided making changes to words that have regional spelling differences. 2016-09-03 09:16:54 -04:00
David Hudson
a566265a72 [Testing] Add ExportImageService mock 2016-09-03 14:45:09 +09:00
David Hudson
fecf419f83 [Testing] Move ExportImageController into constructor for dependency injection 2016-09-03 14:44:33 +09:00
David Hudson
26c14d2bca [Formatting] Fix styling errors 2016-09-03 14:02:19 +09:00
David Hudson
92bfea1773 [Tests] Mock new argument in PlotController 2016-09-03 13:51:37 +09:00
David Hudson
40ad9c47a8 [Tests] Add jsPDF and html2canvas 2016-09-03 13:51:16 +09:00
David Hudson
de85f79ab6 [Enhancement] Hide export buttons during export 
Buttons temporarily hide until export completes.
 2016-09-02 20:41:38 +09:00