aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* 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 branch 'refs/heads/integration-candidate' into FileIO-Build-CandidateJose Antonio Marquez2012-02-28
|\ \ | |/ |/|
| * 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 pull request #78 from imix23ways/TimelineValerio Virgillito2012-02-28
| |\ \ \ | | | | | | | | | | Timeline bug fixes
| | * \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-28
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Timeline : Deleting Layer deletes the element, Deleting Layer selects ↵Jonathan Duran2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | another layer Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | Fix element selection on open docJonathan Duran2012-02-28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | Timeline: Basic document switching.Jon Reid2012-02-28
| | | | |
| | * | | Fix to animation names to support multiclassed elementsJonathan Duran2012-02-28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | remove commentJonathan Duran2012-02-28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | todo noteJonathan Duran2012-02-28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | Fix re-reopened animation duration and millisecondsJonathan Duran2012-02-28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | Timeline: Successfully unbind event listeners in tweens when clearing timeline.Jon Reid2012-02-27
| | | | |
| | * | | Timeline: try to clean up bogus events manually.Jon Reid2012-02-27
| | | | |
| | * | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-27
| | |\ \ \
| | * | | | Timeline: More work on clear timeline method.Jon Reid2012-02-27
| | | | | |
| | * | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-27
| | |\ \ \ \
| | * | | | | Timeline: further work on clearTimeline method.Jon Reid2012-02-27
| | | | | | |
| * | | | | | Merge branch 'FileIO-Build-Candidate' of ↵Valerio Virgillito2012-02-28
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/joseeight/ninja-internal into integration-candidate
| * \ \ \ \ \ \ 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>
* | | | | | | | | 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
|\| | | | | | | | | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix for double clicking in the resizerValerio Virgillito2012-02-27
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Merge branch 'refs/heads/integration-candidate' into TimelineJonathan Duran2012-02-27
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Reverting the export for publish property since its only used for testing.Valerio Virgillito2012-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the enable webGL in the PI for shapes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Timeline : Reopening Doc has layer 1 default fixJonathan Duran2012-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | Timeline: RetrieveStoredTweens calling fixedJonathan Duran2012-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | Merge branch 'refs/heads/integration-candidate' into TimelineJonathan Duran2012-02-27
| |\| | | | |
| | * | | | | Merge branch 'local-storage-version' of ↵Valerio Virgillito2012-02-27
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into integration-candidate
| | | * | | | | removing the old settings class and disabling panel settings until the new ↵Valerio Virgillito2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | panels are in Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | clearing the old local setting and using the new version/prefix local settings.Valerio Virgillito2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | prefixing the local storage and using the new local-storage object.Valerio Virgillito2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-24