| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/integration-candidate' into Timeline | Jonathan Duran | 2012-02-29 |
| |\ | |||
| | * | putting the color panel on top when opening ninja | Valerio Virgillito | 2012-02-28 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵ | Valerio Virgillito | 2012-02-28 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | into integration-candidate Conflicts: js/ninja.reel/ninja.html Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | revert changes to the timeline | Valerio Virgillito | 2012-02-28 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | adding some margin to the bread crumb buttons | Valerio Virgillito | 2012-02-28 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | cleanup and fixing selecting each bread crumb | Valerio Virgillito | 2012-02-28 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | breadcrumb cleanup and moving the resized on top of the timeline panel | Valerio Virgillito | 2012-02-27 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge pull request #81 from ananyasen/integration-candidate | Valerio Virgillito | 2012-02-28 |
| | |\ \ | | | | | | | | | persist selections while switching documents | ||
| | | * | | minor fix for handling selections on switch document | Ananya Sen | 2012-02-28 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | selection controller sets _isDocument = true if number of selections are 0, ↵ | Ananya Sen | 2012-02-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | on switch document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | persist selections while switching documents | Ananya Sen | 2012-02-28 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | Merge pull request #80 from joseeight/FileIO-Build-Candidate | Valerio Virgillito | 2012-02-28 |
| | |\ \ \ | | | | | | | | | | | Adding CSS <link> attributes support to I/O | ||
| | | * | | | Merge branch 'refs/heads/integration-candidate' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-02-28 |
| | | |\| | | |||
| | | * | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-02-28 |
| | | |\ \ \ | |||
| | | | * | | | CSS attributes | Jose Antonio Marquez | 2012-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 FileIO | Jose Antonio Marquez | 2012-02-28 |
| | | | |\ \ \ | |||
| | | | * \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-27 |
| | | | |\ \ \ \ | |||
| | | * | \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-02-28 |
| | | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | |||
| | * | | | | | | | Merge branch 'integration-candidate' of ↵ | Valerio Virgillito | 2012-02-28 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration-candidate | ||
| | | * | | | | | | Merge pull request #79 from pushkarjoshi/pentool | Valerio Virgillito | 2012-02-28 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Pentool | ||
| | | | * | | | | | | reverting manifest name | Pushkar Joshi | 2012-02-28 |
| | | | | | | | | | | |||
| | | | * | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-28 |
| | | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: manifest.json | ||
| | | | * | | | | | | new anchor control guide rendering (smaller handles) | Pushkar Joshi | 2012-02-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and clamp min. width and height to 1 while resizing subpaths | ||
| | | | * | | | | | | Bug fixes: | Pushkar Joshi | 2012-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 'master' into pentool | Pushkar Joshi | 2012-02-24 |
| | | | |\ \ \ \ \ \ | |||
| | | | * | | | | | | | adding unpacked to the manifest file (to differentiate from the ninjateam ↵ | Pushkar Joshi | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (main) chrome app) | ||
| | * | | | | | | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵ | Valerio Virgillito | 2012-02-28 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | integration-candidate | ||
| | | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-28 |
| | | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | |||
| | | * | | | | | | | | Fix for "jumping" issue when using the selection tool repeatedly. | Nivesh Rajbhandari | 2012-02-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | | | Merge pull request #78 from imix23ways/Timeline | Valerio Virgillito | 2012-02-28 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Timeline bug fixes | ||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'FileIO-Build-Candidate' of ↵ | Valerio Virgillito | 2012-02-28 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | https://github.com/joseeight/ninja-internal into integration-candidate | ||
| | | * | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-02-27 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | | | |||
| | | | * | | | | | | | | Updating legal copy | Jose Antonio Marquez | 2012-02-27 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-02-27 |
| | | |\| | | | | | | | | |||
| | | | * | | | | | | | | Updating credits | Jose Antonio Marquez | 2012-02-27 |
| | | | | | | | | | | | | |||
| | | | * | | | | | | | | Merge pull request #21 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-27 |
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | FileIO branch pull request | ||
| | | | | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-27 |
| | | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||
| | | | | * | | | | | | | | - save show3DGrid flag per document while switching documents | Ananya Sen | 2012-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 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-02-27 |
| | | |\| | | | | | | | | | |||
| | | | * | | | | | | | | | Cleaning up pretty functions in IO | Jose Antonio Marquez | 2012-02-27 |
| | | | | | | | | | | | | | |||
| | | | * | | | | | | | | | Cleaning up and adding TODOs | Jose Antonio Marquez | 2012-02-26 |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | Merge branch 'integration' of https://github.com/ericmueller/ninja-internal ↵ | Valerio Virgillito | 2012-02-28 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into integration-candidate | ||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-28 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | integration | ||