aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-04-26
|\
| * Merge pull request #179 from joseeight/FileIOValerio Virgillito2012-04-26
| |\
| | * Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-26
| | |\
| | * | Fixing duplicate layer errorJose Antonio Marquez2012-04-26
| | * | Fixing duplicate layer bugJose Antonio Marquez2012-04-26
* | | | Fixing the eye dropper shortcut.Valerio Virgillito2012-04-26
|/ / /
* | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
|\ \ \ | | |/ | |/|
| * | Merge pull request #175 from mqg734/BoundsCalculationValerio Virgillito2012-04-25
| |\ \
| | * | Fixed issue with setting stroke when using the PI.Nivesh Rajbhandari2012-04-24
| | * | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-24
| | |\|
| | * | Allow users to toggle application of stroke and border settings when using th...Nivesh Rajbhandari2012-04-24
| | * | Fixing translate handles to draw without zoom value. Also fixed some typos i...Nivesh Rajbhandari2012-04-20
* | | | Updating the canvas runtime files for gradient and rectangle radius fixes.Nivesh Rajbhandari2012-04-25
* | | | IKNinja-406 - Strange behavior when changing the corner radius to the maximum...Nivesh Rajbhandari2012-04-25
* | | | Changing canvas-2d gradient drawing to more closely match div's background-im...Nivesh Rajbhandari2012-04-25
* | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
|\| | |
| * | | Merge branch 'master' into pentoolPushkar Joshi2012-04-24
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| | |\|
| | | * Merge branch 'refs/heads/master' into cleanupValerio Virgillito2012-04-19
| | | |\
| | | * | cleanup unused code.Valerio Virgillito2012-04-19
| | * | | Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| | * | | adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| | * | | more backup fixes for the old stageValerio Virgillito2012-04-20
| | * | | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | * | | Merge branch 'refs/heads/Document' into stage-document-architectureValerio Virgillito2012-04-19
| | |\ \ \
| | | * \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-16
| | | |\ \ \
| | | * \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-11
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-10
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-04
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-04
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Backup for mergeJose Antonio Marquez2012-04-04
| | | * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-02
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Setting up document reworkJose Antonio Marquez2012-04-02
| | * | | | | | | | | | typo fixValerio Virgillito2012-04-19
| | * | | | | | | | | | initial stage web templateValerio Virgillito2012-04-18
| * | | | | | | | | | | re-compute and store the center of the subpath in local coordinates upon file...Pushkar Joshi2012-04-24
| * | | | | | | | | | | allow the addition of the pen tool to the timelinePushkar Joshi2012-04-23
| * | | | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-19
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Merge pull request #168 from mqg734/EricMergeValerio Virgillito2012-04-19
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Moving initialzeSnapping routine from RotateObject3DTool tool to Rotate3DTool...Nivesh Rajbhandari2012-04-18
| | | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | * | | | | | | | | Fixing some more merge issues.Nivesh Rajbhandari2012-04-18
| | | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Snapping_II' into EricMergeNivesh Rajbhandari2012-04-18
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Allow snapping to unselected objectshwc4872012-04-17
| | | | * | | | | | | | | | snapping for stage rotation toolhwc4872012-04-16
| | | | * | | | | | | | | | 3D translation fixeshwc4872012-04-16
| | | | * | | | | | | | | | 3D rotationhwc4872012-04-13
| | | | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-04-13
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | |
| | | | * | | | | | | | | | 3D Rotate changeshwc4872012-04-13