aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/TimelineUber' into TimelinePropsJonathan Duran2012-05-11
|\
| * Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-11
| |\
| | * 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>
| | | * 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 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>
| * | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-09
| |\ \ \ \ \ \ \
| | * | | | | | | Timeline: Bug fixes for keyframe drag and drop.Jon Reid2012-05-09
| | | | | | | | |
| * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-09
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| | * | | | | | 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>
| * | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-09
| |\ \ \ \ \ \ \
| | * | | | | | | Timeline: Automatic scrolling during dragging of keyframes.Jon Reid2012-05-08
| | | | | | | | |
| | * | | | | | | Timeline: Bug fix: Account for horizontal scroll when dragging keyframes.Jon Reid2012-05-08
| | | | | | | | |
| | * | | | | | | Timeline: Update drag and drop handlers to be unique for drag and drop type.Jon Reid2012-05-08
| | | | | | | | |
| | * | | | | | | Timeline: Move keyframe dragover and drop listeners to TimelinePanel forJon Reid2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interaction improvements.
| * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-09
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | 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
| | |/ / / / /
| | * | | | | reverting to v0.8 flow component for the picasa carouselValerio Virgillito2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | Fixing the color popupValerio Virgillito2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | Fixing the tools list separators and document bar disabled stateValerio Virgillito2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | fixing the currentContainerValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * \ \ \ \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>