Commit Graph

4682 Commits

Author SHA1 Message Date
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
David Hudson
5984ae46fc Merge branch 'master' of github.com:nasa/openmct into open967 2016-09-08 10:50:08 +09:00
Victor Woeltjen
45ecc7bb2b [API] Ascending/descending order 2016-09-07 14:10:51 -07: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
Victor Woeltjen
a3c3f997cf [API] Move down TC example
...to come after telemetry usage example
2016-09-07 13:25:05 -07:00
Victor Woeltjen
1ae3ce57d0 [API] Telemetry registration example 2016-09-07 13:23:06 -07:00
Andrew Henry
06d229ea99 Merge pull request #1133 from charbelrami/markup
[Frontend] Tweak markup
2016-09-07 13:16:04 -07:00
Victor Woeltjen
616e2b4d77 [API] Exemplify mutate/observe 2016-09-07 13:10:48 -07:00
Victor Woeltjen
0e7d812db7 [API] Document ObjectAPI registration 2016-09-07 13:04:30 -07:00
Victor Woeltjen
c074f29a07 [API] Add gesture example 2016-09-07 11:26:13 -07:00
Victor Woeltjen
92118d353e [API] Add Time Conductor example 2016-09-07 11:24:01 -07:00
Victor Woeltjen
b111eeff07 [API] Update reference 2016-09-07 11:16:24 -07:00
Victor Woeltjen
8042e84911 [API] Add composition-related content 2016-09-07 11:15:26 -07:00
Victor Woeltjen
631c4b5dda [API] Describe composition property 2016-09-07 11:06:27 -07:00
Victor Woeltjen
c6baf2dc1f [API] Make CompositionCollection an interface 2016-09-07 10:58:00 -07:00
Victor Woeltjen
4db7e12d45 [API] Add example for views 2016-09-07 10:55:34 -07:00
Victor Woeltjen
b1799c695e [API] Add DomainObject 2016-09-07 10:46:49 -07:00
Victor Woeltjen
5761c889bc [API] Move MutableObject methods to ObjectAPI 2016-09-07 10:41:48 -07:00
Victor Woeltjen
97cf26d438 [API] Telemetry provider 2016-09-07 10:27:42 -07:00
Victor Woeltjen
c4b83b7589 [API] Account for provider strategies 2016-09-07 10:18:43 -07:00
Victor Woeltjen
d56f30c15a [API] TelemetryRequest 2016-09-07 10:15:57 -07:00
Victor Woeltjen
7279c5d857 [API] Mark properties as optional 2016-09-07 10:12:47 -07:00
Victor Woeltjen
5d53ab83a3 [API] More TelemetryProperty properties 2016-09-07 10:11:52 -07:00
Victor Woeltjen
4565e45b36 [API] Add TelemetryProperty for metadata 2016-09-07 10:08:07 -07:00
Victor Woeltjen
5950daa6cb [API] Move out composition policy 2016-09-07 09:33:21 -07:00
Victor Woeltjen
60800c913e [API] Gestures 2016-09-07 09:28:26 -07:00
Victor Woeltjen
649567176d [API] Notes on context 2016-09-07 09:21:18 -07:00
Victor Woeltjen
1df573b8c6 [API] Move types into registry 2016-09-07 08:50:20 -07:00
Victor Woeltjen
bc4ca10e53 [API] Separate out ViewRegistry 2016-09-07 08:45:18 -07:00