| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-28 |
| |\ | |||
| | * | Fix for double clicking in the resizer | Valerio Virgillito | 2012-02-27 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'refs/heads/integration-candidate' into Timeline | Jonathan Duran | 2012-02-27 |
| | |\ | |||
| | | * | Reverting the export for publish property since its only used for testing. | Valerio Virgillito | 2012-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 fix | Jonathan Duran | 2012-02-27 |
| | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Timeline: RetrieveStoredTweens calling fixed | Jonathan Duran | 2012-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 Timeline | Jonathan Duran | 2012-02-27 |
| | |\| | |||
| | | * | Merge branch 'local-storage-version' of ↵ | Valerio Virgillito | 2012-02-27 |
| | | |\ | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into integration-candidate | ||
| | | | * | removing the old settings class and disabling panel settings until the new ↵ | Valerio Virgillito | 2012-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 Virgillito | 2012-02-24 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | prefixing the local storage and using the new local-storage object. | Valerio Virgillito | 2012-02-24 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | Merge branch 'refs/heads/master' into local-storage-version | Valerio Virgillito | 2012-02-24 |
| | | | |\ | |||
| | | | * \ | Merge branch 'refs/heads/master' into local-storage-version | Valerio Virgillito | 2012-02-23 |
| | | | |\ \ | |||
| | | | * | | | local storage integration and versioning | Valerio Virgillito | 2012-02-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed the splitters Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | Merge branch 'FileIO-Build-Candidate' of ↵ | Valerio Virgillito | 2012-02-27 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | https://github.com/joseeight/ninja-internal into integration-candidate | ||
| | | * \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-24 |
| | | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||
| | | * | | | | | Moved all color updating routines to a single function. | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | Distinguish between border top/right/bottom/left colors. Also, fall back to ↵ | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snapping routine when selecting only if the active tool allows snapping. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | Adjusting fill and ink bottle cursors to match the tips of the icons. | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | Timeline : Selection Fix | Jonathan Duran | 2012-02-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | Timeline: Order of tweens and corresponding layers taken care over | Jonathan Duran | 2012-02-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | Timeline : Adding Tweens Properties | Jonathan Duran | 2012-02-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | Timeline: Add grids to property tracks. First take on clearTimeline method ↵ | Jon Reid | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on TimelinePanel class. | ||
| | * | | | | | | Timeline: Bug fixes: Delete corresponding track when a style is deleted from ↵ | Jon Reid | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a layer, and fix serialization variable problem. | ||
| | * | | | | | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-24 |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | * | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-24 |
| | |\ \ \ \ \ \ | |||
| | | * | | | | | | - added flag for timeline to identify new file flow | Jonathan Duran | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added switchDocument event for timeline Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-02-24 |
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||
| | * | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-23 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | ||
| | * | | | | | | | Timeline: Add hottext fields to layers and serialize them throughout. | Jon Reid | 2012-02-23 |
| | | |/ / / / / | |/| | | | | | |||
| | * | | | | | | add back layer selection | Jonathan Duran | 2012-02-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | Remove unneeded selection code | Jonathan Duran | 2012-02-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | Move element selection to click handler | Jonathan Duran | 2012-02-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | Updating legal copy | Jose Antonio Marquez | 2012-02-27 |
| | | | | | | | | |||
| * | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 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 |
| | | |_|_|_|/ / | |/| | | | | | |||
| | * | | | | | | Cleaning up formatting for webGL data | Jose Antonio Marquez | 2012-02-26 |
| | | | | | | | | |||
| | * | | | | | | Fixed issue with losing track of Ninja template css | Jose Antonio Marquez | 2012-02-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleaned up URL getter for app in cleaning string code. | ||
| | * | | | | | | Cleaning up comments for external styles loading | Jose Antonio Marquez | 2012-02-25 |
| | | | | | | | | |||
| | * | | | | | | Cleaning up ninja-data attributes | Jose Antonio Marquez | 2012-02-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added logic to load cross-domain CSS from CDN, but need to explore how to load without impacting permissions. | ||
| | * | | | | | | Adding prettify code to I/O | Jose Antonio Marquez | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a possible set of methods to be used to prettify code. Added temporarily until approved. | ||
| | * | | | | | | Merge pull request #19 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-24 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | FileIO branch pull request | ||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-24 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||
| | | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-02-24 |
| | | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||
| | | | * | | | | | Marking inkbottle as the final tool in the set. | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle ↵ | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||