Commit Graph

4682 Commits

Author SHA1 Message Date
Victor Woeltjen
dfc5021e11 [API] Fix JSDoc for Dialog 2016-09-29 16:47:33 -07:00
Victor Woeltjen
9e3a3529e0 [API] Rename main module 2016-09-29 16:46:22 -07:00
Victor Woeltjen
434ea5487a Merge branch 'api-1110' into api-1124b 2016-09-29 16:43:47 -07:00
Victor Woeltjen
987d98b47e [API] Restore JSDoc for openmct module 2016-09-29 16:37:57 -07:00
Victor Woeltjen
53974bd69a Merge branch 'subobject-selection-1126' into api-1124b
Conflicts:
	bower.json
	index.html
	main.js
	src/openmct.js
2016-09-29 10:54:08 -07:00
Victor Woeltjen
ed8d331cd3 [API] Merge in latest from master 2016-09-29 10:47:52 -07:00
Pete Richards
7439d949c4 Merge pull request #1209 from nasa/jspdf-1208b
[Build] Fix jsPDF dependency
2016-09-28 09:30:50 -07:00
Victor Woeltjen
e1276e464d [Build] Restore version identifier 2016-09-27 16:49:09 -07:00
Victor Woeltjen
d248dfe346 [Build] Remove SNAPSHOT status
...to tag a build which addresses release blocker #1208
2016-09-27 16:48:38 -07:00
Victor Woeltjen
91b63f78eb [Build] Depend on non-minified jsPDF
Fixes #1208 (for some reason)
2016-09-27 16:47:42 -07:00
Victor Woeltjen
754d7b3cd7 [Build] Restore SNAPSHOT status
... for a patch build related to #1208
2016-09-27 16:47:35 -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
Victor Woeltjen
d61f446002 [Selection] Add a click-elsewhere gesture 2016-09-26 15:21:43 -07:00
Victor Woeltjen
763f7dd021 [Selection] Begin adapting actions 2016-09-26 12:37:02 -07:00
Victor Woeltjen
cad255ce83 [Selection] Use variable name expected by template 2016-09-26 11:52:14 -07:00
Victor Woeltjen
3b4239fbd9 [Selection] Use AngularView for context menus 2016-09-26 11:43:38 -07:00
Victor Woeltjen
15ef89f455 [Selection] Bring over context menu template 2016-09-26 11:38:37 -07:00
Victor Woeltjen
c9a0a469f6 [Selection] Position context menus 2016-09-25 20:30:42 -07:00
Victor Woeltjen
f926bd9762 [Selection] Position overlays 2016-09-25 19:38:03 -07:00
Victor Woeltjen
d79392aeaa [Selection] Begin integrating OverlayManager 2016-09-25 18:26:00 -07:00
Victor Woeltjen
9a5bda4917 [Selection] Sketch in overlay manager 2016-09-25 18:22:07 -07:00
Victor Woeltjen
407550e6f4 [Selection] Inject actionRegistry 2016-09-23 15:48:43 -07:00
Victor Woeltjen
8b44b44e38 [Selection] Generalize Registry 2016-09-23 15:46:45 -07:00
Victor Woeltjen
8dfa8df28a [Selection] Allow providers to return array
...to allow one-to-many providers for actions, as is useful
for Create et al (and, in this specific case, to support
adapters.)
2016-09-23 15:45:46 -07:00
Victor Woeltjen
9e19296b14 [Selection] Add ActionRegistry 2016-09-23 15:35:40 -07:00
Victor Woeltjen
106632c21c [Selection] Remove unused import 2016-09-23 15:32:40 -07:00
Victor Woeltjen
235032a571 [Selection] Wire in new contextmenu 2016-09-23 15:27:39 -07:00
Victor Woeltjen
db41f6e64f [Selection] Obey priority order 2016-09-23 15:19:16 -07:00
Victor Woeltjen
e83e0da521 [Selection] Export openmct from main.js 2016-09-23 15:16:32 -07:00
Victor Woeltjen
c411f8fbe3 [Selection] Go through openmct API 2016-09-23 15:07:03 -07: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
c179d9e759 Merge branch 'BogdanAlexandru-mct588comm' 2016-09-22 17:45:41 -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
Victor Woeltjen
43c32c2c7b Merge pull request #1201 from nasa/open1080
[Edit Mode] Fixed issue with save dialog not being displayed for new objects after mutation
2016-09-22 16:23:49 -07:00
Victor Woeltjen
3f5388c2e8 [Build] Restore SNAPSHOT status
...and bump version number to open sprint Rajaniemi,
https://github.com/nasa/openmct/milestone/18
2016-09-22 16:20:18 -07:00
Victor Woeltjen
bad24d6213 [Build] Remove SNAPSHOT status
...to close sprint Pratchett,
https://github.com/nasa/openmct/milestone/17
2016-09-22 15:48:48 -07:00
Victor Woeltjen
4ce952846c [Selection] Expose context menu adapter 2016-09-22 11:51:00 -07:00
Victor Woeltjen
fdab4a614f [Selection] Expose contextual gesture 2016-09-22 11:48:44 -07:00
Victor Woeltjen
152f55652f [Selection] Add adapter for context menu 2016-09-22 11:46:37 -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
Victor Woeltjen
c46c42e576 [Selection] Sketch in AngularView
...for use in the adapter layer.
2016-09-21 15:39:56 -07:00
Victor Woeltjen
75bf956c3d [Selection] Use context typedef 2016-09-21 14:54:22 -07:00
Victor Woeltjen
0a44c48338 [Selection] Sketch in context menu gesture 2016-09-21 13:27:59 -07:00
Victor Woeltjen
e4c3412e8a [Selection] Sketch in context menu view 2016-09-21 13:16:24 -07:00
Victor Woeltjen
4e1cfac4b9 [Selection] Expose inspector registry 2016-09-21 12:30:36 -07:00
Victor Woeltjen
0a64e9f515 [Selection] Add ViewRegistry 2016-09-21 12:29:43 -07:00