Henry
07140b179f
Merge branch 'master' into open933
2016-10-07 14:54:18 -07:00
Henry
3e9c0eb7a5
Merged from master to resolve build issues
2016-10-05 12:25:04 -07:00
Henry
f1d2072bb9
Added license information
2016-10-05 11:17:22 -07:00
Henry
bff4e120a7
[Tables] Modified selection of scrollable element. Fixes #1216
2016-10-04 19:14:47 -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
Henry
904d56a089
[Time Conductor] #933 Clean up time conductor listeners on scope destruction
2016-09-22 13:32:43 -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
David Hudson
d913798d5b
[Timeline] Add battery starting state-of-charge
...
Issue #1185
2016-09-18 22:52:41 +09: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
Henry
a1331b7bb3
Merge branch 'master' into open933
2016-09-12 16:54:45 -07:00
Henry
9a06325533
Merge branch 'master' into open933
2016-09-12 14:39:24 -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
Henry
e639e056ba
[Time Conductor] Fixing bugs found in smoke testing. Fixes #933
2016-09-09 18:51:47 -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
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
Henry
fbab890081
[Time Conductor] Switched conductor to mct-include rather than mct-representation to avoid warnings
2016-09-07 14:29:21 -07:00
Henry
d37dd52ee1
Merge branch 'master' into open933
2016-09-06 16:43:17 -07:00
Henry
7af5875dd5
[Time Conductor] #933 Fixed code style errors
2016-09-06 10:05:10 -07:00
Andrew Henry
c6eaa3d528
[Time Conductor] Adding tests and fixing failing ones. #933
2016-09-05 19:32:19 -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
de85f79ab6
[Enhancement] Hide export buttons during export
...
Buttons temporarily hide until export completes.
2016-09-02 20:41:38 +09:00
Charles Hacskaylo
e7a7025961
[Frontend] Markup for #967
...
Fixes #967
WIP to be integrated with work
from hudsonfoo in PR #1164
(cherry picked from commit ebadad61c6
)
2016-09-02 18:19:20 +09:00
David Hudson
e38cf1e2e8
Merge branch 'master' of github.com:nasa/openmct into open967
2016-09-02 18:17:46 +09:00
David Hudson
3e3d3ebcf9
[Formatting] Switched to double quote across the board for consistency
2016-09-02 11:58:15 +09:00
David Hudson
e370271093
[Code Review] Updates based on code review by @VWoeltjen
...
Set export functions on the ExportImageService prototype. Insantiated
ExportImageService in the PlotController for better dependcy injection.
2016-09-02 11:54:38 +09:00