Pete Richards
|
96d9f8c194
|
[Templates] load plot templates with require
Load templates with requirejs.
https://github.com/nasa/openmctweb/issues/673
|
2016-03-01 10:52:07 -08:00 |
|
Pete Richards
|
748673f99b
|
Merge branch 'master' into open638_rebase
|
2016-03-01 10:48:53 -08:00 |
|
Pete Richards
|
78374f8241
|
Merge branch 'open401'
|
2016-03-01 10:37:12 -08:00 |
|
Victor Woeltjen
|
bf1fa0ac4c
|
[Templates] Include templates using text plugin
Resolves #673
|
2016-02-26 13:07:50 -08:00 |
|
Pete Richards
|
fcdf89a4ee
|
Merge branch 'master' into open638_rebase
|
2016-02-23 10:56:13 -08:00 |
|
Victor Woeltjen
|
d3e274bfdd
|
Merge branch 'master' into open401
Resolve conflicts for #416
Conflicts:
platform/commonUI/browse/bundle.json
platform/commonUI/browse/src/BrowseController.js
|
2016-02-22 14:27:21 -08:00 |
|
Henry
|
645bd5743f
|
[Plots] #638 Addressing feedback from code review
[Plots] #638 Fixing failing tests
[Plot] Changed PlotOptionsController to prototype form
Fixed spacing
Fixed jslint issue
|
2016-02-08 23:36:45 -08:00 |
|
Victor Woeltjen
|
b0e4947bf0
|
Merge pull request #500 from nasa/open480
[New Edit Mode] Adding sub objects to Timelines
|
2016-02-08 11:59:54 -08:00 |
|
Henry
|
abf5f22155
|
[Plots] #638 added onchange handling in order to synchronize forms with domain object model.
Fixed failing test
Added tests
jslint errors
Minor refactoring of layout bundle
revert layout/bundle.json
|
2016-02-04 14:26:21 -08:00 |
|
Henry
|
6fb6761abf
|
[Plots] #638 New plot display options
|
2016-02-04 14:23:28 -08:00 |
|
Henry
|
54653f3914
|
[Create] #491 Locator is not visible when creating a new object where selected object does not have location
Added additional test for default context
Fixed JSLint error
|
2016-01-21 16:35:18 -08:00 |
|
Henry
|
c65096f166
|
[New Edit Mode] Added AddAction, modified EditableDomainObject to properly wrap inherited functions, added new EditableInstantiationCapability
|
2016-01-20 18:49:39 -08:00 |
|
Henry
|
3e7eb11d84
|
Regenerated bundles
|
2016-01-14 17:08:19 -08:00 |
|