aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | | | Merge branch 'refs/heads/integration-candidate' into FileIO-Build-CandidateJose Antonio Marquez2012-02-28
| | |\| | | | | | | | | | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | CSS attributesJose Antonio Marquez2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting up logic to include attributes in <link> for the <style> duplicates and add attributes created in Ninja back to <link> tag on save.
| | * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-28
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| * | | | | | | | | | Merge branch 'integration-candidate' of ↵Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration-candidate
| | * | | | | | | | | Merge pull request #79 from pushkarjoshi/pentoolValerio Virgillito2012-02-28
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | | Pentool
| | | * | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-28
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: manifest.json
| | | * | | | | | | | new anchor control guide rendering (smaller handles)Pushkar Joshi2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and clamp min. width and height to 1 while resizing subpaths
| | | * | | | | | | | Bug fixes:Pushkar Joshi2012-02-28
| | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1152: allow deleting of multiple paths from inside pen tool 1128: keyboard hotkey shortcut 'P' for pen tool 941: changing width or height of the path scales the path
| * | | | | | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | integration-candidate
| | * | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-28
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Fix for "jumping" issue when using the selection tool repeatedly.Nivesh Rajbhandari2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Merge pull request #78 from imix23ways/TimelineValerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Timeline bug fixes
| * \ \ \ \ \ \ \ \ Merge branch 'FileIO-Build-Candidate' of ↵Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | https://github.com/joseeight/ninja-internal into integration-candidate
| | * | | | | | | | Updating legal copyJose Antonio Marquez2012-02-27
| | | | | | | | | |
| | * | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-27
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Cleaning up pretty functions in IOJose Antonio Marquez2012-02-27
| | | | | | | | | | |
| | | * | | | | | | | Cleaning up and adding TODOsJose Antonio Marquez2012-02-26
| | | | | | | | | | |
| | * | | | | | | | | - save show3DGrid flag per document while switching documentsAnanya Sen2012-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix zoom tool keyboard control to listen to Z when ctrl and shift keys are not pressed with it Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | Merge branch 'integration' of https://github.com/ericmueller/ninja-internal ↵Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into integration-candidate
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-28
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | integration
| | * | | | | | | | | | Enable shift key constraint for Pan Tool.hwc4872012-02-27
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-27
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | integration
| | * | | | | | | | | | Color fix for line shapes.hwc4872012-02-27
| | | | | | | | | | | |
| | * | | | | | | | | | Changed the hardcoded publish setting for a PI fix.hwc4872012-02-27
| | | | | | | | | | | |
| | * | | | | | | | | | Fixed various rendering bugs.hwc4872012-02-27
| | | | | | | | | | | |
| | * | | | | | | | | | bug fixes for canvas 2d shape drawing.hwc4872012-02-23
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | / / / / | | | |_|_|_|_|/ / / / | | |/| | | | | | | | integration-candidate
| | * | | | | | | | | Fixing tooltips and keyboard shortcuts for 3d tools.Nivesh Rajbhandari2012-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1014 and IKNinja-1015. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | Reset translation values as well when double-clicking to reset the rotation ↵Nivesh Rajbhandari2012-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | Merge branch 'Timeline-main' into Timeline-localJon Reid2012-03-01
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Set doc dirty flag when adding tweens or modifying animationsJonathan Duran2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | | | | Update master track on duration change instead of tween add.Jonathan Duran2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <