aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Finished skeleton structure for binding.Armen Kesablyan2012-05-15
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge branch 'refs/heads/masterDomArc' into bindingArmen Kesablyan2012-05-14
|\
| * Merge pull request #219 from mqg734/TreeFixValerio Virgillito2012-05-11
| |\ | | | | | | Removing outdated references in tree code.
| | * Removing obsolete treeList reference in preset templates.Nivesh Rajbhandari2012-05-11
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #215 from mqg734/WebGLFixesValerio Virgillito2012-05-11
| |\ \ | | |/ | |/| Updated Line, Oval and Rectangle geom classes to use object literal notation. Also, updated canvas-runtime.js to use object literal notation.
| | * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-10
| | |\ | | |/ | |/| | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-05-09
| |\ \
| | * \ Merge pull request #185 from ericguzman/StylesControllerPatchValerio Virgillito2012-05-09
| | |\ \ | | | | | | | | | | Styles Controller - Fix error when trying dispatch stylesheet change eve...
| | | * | Styles Controller - Fix error when trying dispatch stylesheet change eventEric Guzman2012-05-01
| | | | |
| * | | | some code cleanupValerio Virgillito2012-05-09
| |/ / / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Squashed commit of google-components into masterValerio Virgillito2012-05-09
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Updating canvas-runtime to use object literal notation.Nivesh Rajbhandari2012-05-10
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-08
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #201 from ericmueller/SnappingValerio Virgillito2012-05-08
| |\ \ \ | | | | | | | | | | fixes for 2D and 3D translation.
| | * | | Fixed a snapping issue on the mouse down in drawing tools.hwc4872012-05-08
| | | | |
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-08
| | |\ \ \ | | |/ / / | |/| | | | | | | | Snapping
| * | | | Merge pull request #197 from ananyasen/code-editor-patchValerio Virgillito2012-05-08
| |\ \ \ \ | | | | | | | | | | | | Patch to fix code editor issue with latest montage
| | * | | | IKNINJA-1603Ananya Sen2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uncaught TypeError: Cannot read property 'documentRoot' of null js/components/layout/bread-crumb.reel/bread-crumb.js:26 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | fixed javascript errorsAnanya Sen2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | removed incorrect id selector css for code view container since its breaking it.Ananya Sen2012-05-07
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * / / fixes for 2D and 3D translation.hwc4872012-05-07
| |/ / /
| | | * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-07
| | | |\ | | |_|/ | |/| |
| | | * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-03
| | | |\
| | | * | Converting canvas runtime to use prototypes for geom obj, rectangle, oval ↵Nivesh Rajbhandari2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and line. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-03
| | | |\ \
| | | * | | Converting geom-obj to object literal notation.Nivesh Rajbhandari2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Converting line, circle and rectangle shapes to object literal notation.Nivesh Rajbhandari2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | ChangesArmen Kesablyan2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | Workspace: has customizedArmen Kesablyan2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | created the initial environment requirements for workspace to be manipulated.Armen Kesablyan2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | After merge file changeArmen Kesablyan2012-05-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-08
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-properties.reel/tools-properties.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * \ \ \ \ \ Merge pull request #199 from joseeight/DocumentValerio Virgillito2012-05-07
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Cleaning up webGL
| | * \ \ \ \ \ Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-07
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #198 from joseeight/DocumentValerio Virgillito2012-05-07
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Cleaning up some CSS parsers.
| | | * | | | | | Moving webGL to own helper classJose Antonio Marquez2012-05-07
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Cleaning up webGL for better working files.
| | * | | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-07
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #196 from joseeight/DocumentValerio Virgillito2012-05-07
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Adding webGL for open file.
| | | * | | | | | Extracting CSS methods to parsing class.Jose Antonio Marquez2012-05-07
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Need to do the same with webGL.
| | * | | | | | Adding webGL support for opening filesJose Antonio Marquez2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added I/O for loading webGL on open file. I/O support for saving to come.
| | * | | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-07
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #195 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-04
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixes for 3d, selection, and keyboard shortcuts
| | * | | | | | | Temporarily skipping activeDocument.currentView check so keyboard shortcuts ↵Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | Fixing references to iframe's styles in new template.Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | Draw 3d grid by default since app model is not hooked up yet.Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-04
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | reverting to v0.8 flow component for the picasa carouselValerio Virgillito2012-05-04
| | | | | | | | | | | | | | | | | | |