| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 | ||
| | | * | | | | 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 | ||
| | | | * | | | | - added closeDocument event for timeline | Ananya Sen | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - minor bug fixes Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | * | | | | - added flag for timeline to identify new file flow | Ananya Sen | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added switchDocument event for timeline Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | * | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 |
| | | | |\ \ \ \ | |||
| | | | * | | | | | refresh draw-utils, snap-manager, view-utils for html document stitching | Ananya Sen | 2012-02-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | * | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 |
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | * | | | | | | switch html document - re-initialize draw-utils and snap-manager on opening ↵ | Ananya Sen | 2012-02-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-24 |
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||
| | | * | | | | | | | Added import/export of RDGE data | Jose Antonio Marquez | 2012-02-24 |
| | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | This is only the IO aspect, the data getter seems broken for 2D canvas and does not allow for save, and nothing works for setting the data on load. However, the IO aspect of saving and opening the data are not incorporated. | ||
| | | * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||
| | | * | | | | | | Merge pull request #17 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-02-23 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Integration | ||
| | | | * \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-23 |
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/preloader/Preloader.js | ||
| | | | * | | | | | | | GL save and reload. | hwc487 | 2012-02-22 |
| | | | | | | | | | | | |||
| | | | * | | | | | | | Runtime classes | hwc487 | 2012-02-22 |
| | | | | | | | | | | | |||
| | | | * | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integration | hwc487 | 2012-02-22 |
| | | | |\ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-22 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | integration | ||
| | | | * | | | | | | | | Added all materials back in | hwc487 | 2012-02-22 |
| | | | | | | | | | | | | |||
| | | | * | | | | | | | | Adding all the shaders back in | hwc487 | 2012-02-22 |
| | | | | | | | | | | | | |||
| | | | * | | | | | | | | Adding bug fixes. | hwc487 | 2012-02-22 |
| | | | | | | | | | | | | |||
| | | | * | | | | | | | | Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into ↵ | hwc487 | 2012-02-21 |
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration | ||
| | | * | \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | |||
| | | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js | ||
| | | * | | | | | | | | | | | Fixing document mode check | Jose Antonio Marquez | 2012-02-23 |
| | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||
| | | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | Adding url clean up to HTML on save | Jose Antonio Marquez | 2012-02-23 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into file-io | Valerio Virgillito | 2012-02-23 |