| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 | ||
| | * \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-28 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | integration | ||
| | * | | | | | | Enable shift key constraint for Pan Tool. | hwc487 | 2012-02-27 |
| | | | | | | | | |||
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-27 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | integration | ||
| | * | | | | | | | Color fix for line shapes. | hwc487 | 2012-02-27 |
| | | | | | | | | | |||
| | * | | | | | | | Changed the hardcoded publish setting for a PI fix. | hwc487 | 2012-02-27 |
| | | | | | | | | | |||
| | * | | | | | | | Fixed various rendering bugs. | hwc487 | 2012-02-27 |
| | | | | | | | | | |||
| | * | | | | | | | bug fixes for canvas 2d shape drawing. | hwc487 | 2012-02-23 |
| | | | | | | | | | |||
| * | | | | | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵ | Valerio Virgillito | 2012-02-28 |
| |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | integration-candidate | ||
| | * | | | | | | | Fixing tooltips and keyboard shortcuts for 3d tools. | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-02-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | Merge branch 'refs/heads/integration-candidate' | Valerio Virgillito | 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> | ||
| | | | * | | | | | | | fixing the right panel disappearing when collapsed and re-enabled | 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 pull request #20 from joseeight/FileIO | Jose Antonio Marquez Russo | 2012-02-26 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | | | File IO Updates | ||
| | | | | * | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||