aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | Merge branch 'stage-fixes' of github.com:mencio/ninja-internal into stage-fixesValerio Virgillito2012-03-01
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/TagTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * / / / / stage and elements fixesValerio Virgillito2012-03-01
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Resizing the iframe container when resizing the stage - Removing 3d rules from elements when adding them - Adding a name property in the pi Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Optimizing URL intercepting detectionJose Antonio Marquez2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | Modified the way the webRequest maps to the file.
* | | | | | Merge pull request #24 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-29
|\ \ \ \ \ \ | |/ / / / / |/| | | | | undo/redo per document , codemirror 2.22 update
| * | | | | Merge branch 'refs/heads/ninja-internal-master' into FileIOAnanya Sen2012-02-29
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js js/document/html-document.js js/panels/properties/content.reel/content.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | Merge branch 'refs/heads/integration-candidate'Valerio Virgillito2012-02-29
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #88 from mqg734/ToolFixesValerio Virgillito2012-02-29
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix for performance issue when moving shapes.
| | * | | | | | Fix for performance issue when moving shapes. We don't need to call render ↵Nivesh Rajbhandari2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | except if the geometry and materials change. This is more easy to see with shapes like the brush tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | Merge branch 'SnapManagerFixes' of https://github.com/mqg734/ninja-internal ↵Valerio Virgillito2012-02-29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into integration-candidate
| * \ \ \ \ \ \ \ Merge branch 'integration-candidate' of ↵Valerio Virgillito2012-02-29
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration-candidate
| | * \ \ \ \ \ \ \ Merge pull request #87 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-02-29
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixes to preview caching issues
| | | * \ \ \ \ \ \ \ Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-29
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Preview FixJose Antonio Marquez2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding save all logic before preview, temporary fix.
| | | * | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-29
| | | |\| | | | | | | |
| | | | * | | | | | | | Fix: Caching issue with chrome tab APIJose Antonio Marquez2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using window.open to test movie.
| | | | * | | | | | | | Making class level url template variableJose Antonio Marquez2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a class level variable for the URL to be parsed out of the user files.
| | * | | | | | | | | | Merge pull request #86 from imix23ways/TimelineValerio Virgillito2012-02-29
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | Timeline
| | | * | | | | | | | | Merge branch 'refs/heads/integration-candidate' into TimelineJonathan Duran2012-02-29
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-02-29
| | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |