aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-11
|\
| * Merge pull request #219 from mqg734/TreeFixValerio Virgillito2012-05-11
| |\
| | * Removing obsolete treeList reference in preset templates.Nivesh Rajbhandari2012-05-11
| | * Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
| * | Merge pull request #215 from mqg734/WebGLFixesValerio Virgillito2012-05-11
| |\ \ | | |/ | |/|
| | * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-10
| | |\ | | |/ | |/|
| | * Updating canvas-runtime to use object literal notation.Nivesh Rajbhandari2012-05-10
| | * 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 and...Nivesh Rajbhandari2012-05-03
| | * | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-03
| | |\ \ \ \
| | * | | | | Converting geom-obj to object literal notation.Nivesh Rajbhandari2012-05-02
| | * | | | | Converting line, circle and rectangle shapes to object literal notation.Nivesh Rajbhandari2012-05-02
* | | | | | | 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 eventEric Guzman2012-05-01
| * | | | | | | | some code cleanupValerio Virgillito2012-05-09
| |/ / / / / / /
| * | | | | | / Squashed commit of google-components into masterValerio Virgillito2012-05-09
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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
* | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-09
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Merge pull request #201 from ericmueller/SnappingValerio Virgillito2012-05-08
| |\ \ \ \ \ \
| | * | | | | | 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 Sna...hwc4872012-05-08
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #197 from ananyasen/code-editor-patchValerio Virgillito2012-05-08
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | IKNINJA-1603Ananya Sen2012-05-08
| | * | | | | | fixed javascript errorsAnanya Sen2012-05-07
| | * | | | | | removed incorrect id selector css for code view container since its breaking it.Ananya Sen2012-05-07
| |/ / / / / /
| | * / / / / fixes for 2D and 3D translation.hwc4872012-05-07
| |/ / / / /
| * | | | | reverting to v0.8 flow component for the picasa carouselValerio Virgillito2012-05-04
| * | | | | Fixing the color popupValerio Virgillito2012-05-04
| * | | | | Fixing the tools list separators and document bar disabled stateValerio Virgillito2012-05-04
| * | | | | temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
| * | | | | fixing the currentContainerValerio Virgillito2012-05-03
| * | | | | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Refactor creating elements. Removed makeNJElement and separated the model cre...Valerio Virgillito2012-05-03
| | * | | | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Nesting absolute element in the Tag tool. Refactoring element creation and el...Valerio Virgillito2012-05-02
| | * | | | | code cleanupValerio Virgillito2012-05-02
| | | |_|_|/ | | |/| | |
| * | | | | integrating the latest montage versionValerio Virgillito2012-05-03
| * | | | | Removing unused components referencesValerio Virgillito2012-05-03