aboutsummaryrefslogtreecommitdiff
path: root/user-document-templates
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-13
|\ | | | | | | | | | | | | Conflicts: js/components/treeview/ninja-leaf.reel/ninja-leaf.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Make Stage work after live previewJonathan Duran2012-02-08
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Setting defaults and more cleanupValerio Virgillito2012-02-09
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Switching the components panel to use the new ninja tree component.Valerio Virgillito2012-02-09
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | removing the appdelegate. Now using a main reel instead.Valerio Virgillito2012-02-03
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | removing the old v0.6 montage folder and updating the referencesValerio Virgillito2012-02-03
| |
* | Merge branch 'master' into componentsValerio Virgillito2012-02-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: node_modules/montage/ui/bluemoon/progress.reel/progress.html node_modules/montage/ui/image2.reel/image2.html node_modules/ninja-components/effect/desaturate-effect.js node_modules/ninja-components/effect/effect.js node_modules/ninja-components/effect/invert-effect.js node_modules/ninja-components/effect/kaliedoscope-effect.js node_modules/ninja-components/effect/multiply-effect.js node_modules/ninja-components/effect/sepia-effect.js node_modules/ninja-components/flow-controller.reel/flow-controller.html node_modules/ninja-components/flow-controller.reel/flow-controller.js node_modules/ninja-components/flow-offset.js node_modules/ninja-components/hottext.reel/hottext.css node_modules/ninja-components/hottext.reel/hottext.html node_modules/ninja-components/hottext.reel/hottext.js node_modules/ninja-components/hottextunit.reel/hottextunit.css node_modules/ninja-components/hottextunit.reel/hottextunit.html node_modules/ninja-components/hottextunit.reel/hottextunit.js node_modules/ninja-components/image2.reel/image2.html node_modules/ninja-components/image2.reel/image2.js node_modules/ninja-components/image3d.reel/image3d.html node_modules/ninja-components/image3d.reel/image3d.js node_modules/ninja-components/photo-editor.reel/photo-editor.css node_modules/ninja-components/photo-editor.reel/photo-editor.html node_modules/ninja-components/photo-editor.reel/photo-editor.js node_modules/ninja-components/slider-base.js user-document-templates/montage-application-cloud/appdelegate.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * removing references to the old components in the app delegateValerio Virgillito2012-02-02
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Fix the main user component to create distinct instance of component.Valerio Virgillito2012-02-03
| | | | | | | | | | | | | | - Create a distinct instance of button - Cleanup. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Using async to load the required component.Valerio Virgillito2012-02-02
| |
* | adding a componentController and callback for lazy loading.Valerio Virgillito2012-02-02
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Changing the user document application to use a main componentValerio Virgillito2012-02-01
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Montage Native Widgets: Cleanup of current componentsValerio Virgillito2012-01-31
|/ | | | | | | | Cleaning up the current components support files: - Clean the component tree - Clean the app delegate and panel Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>