aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-28
|\
| * reverting manifest namePushkar Joshi2012-02-28
| |
* | Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-28
|\|
| * Merge branch 'master' into pentoolPushkar Joshi2012-02-28
| |\ | | | | | | | | | | | | Conflicts: manifest.json
| | * Merge branch 'refs/heads/integration-candidate'Valerio Virgillito2012-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>
| | | | | * fixing the right panel disappearing when collapsed and re-enabledValerio Virgillito2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | * Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-24
| | | | | |\
| | | | | * \ Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-23
| | | | | |\ \
| | | | | * | | local storage integration and versioningValerio Virgillito2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed the splitters Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | | | Merge branch 'FileIO-Build-Candidate' of ↵Valerio Virgillito2012-02-27
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/joseeight/ninja-internal into integration-candidate
| | | | | * \ \ \ Merge pull request #20 from joseeight/FileIOJose Antonio Marquez Russo2012-02-26
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | File IO Updates
| | | | | | * | | | Cleaning up formatting for webGL dataJose Antonio Marquez2012-02-26
| | | | | | | | | |
| | | | | | * | | | Fixed issue with losing track of Ninja template cssJose Antonio Marquez2012-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleaned up URL getter for app in cleaning string code.
| | | | | | * | | | Cleaning up comments for external styles loadingJose Antonio Marquez2012-02-25
| | | | | | | | | |
| | | | | | * | | | Cleaning up ninja-data attributesJose Antonio Marquez2012-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/OJose Antonio Marquez2012-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/FileIOJose Antonio Marquez Russo2012-02-24
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | FileIO branch pull request
| | | | | | * | | | - added closeDocument event for timelineAnanya Sen2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - minor bug fixes Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | | | * | | | - added flag for timeline to identify new file flowAnanya Sen2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added switchDocument event for timeline Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | | | * | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
| | | | | | |\ \ \ \
| | | | | | * | | | | refresh draw-utils, snap-manager, view-utils for html document stitchingAnanya Sen2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | | | * | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-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 Sen2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | | * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
| | | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | | Added import/export of RDGE dataJose Antonio Marquez2012-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 FileIOJose Antonio Marquez2012-02-23
| | | | | |\ \ \ \ \ \ \ | | | | | | | |_|_|_|/ / | | | | | | |/| | | | |
| | | | | * | | | | | | Merge pull request #17 from ericmueller/integrationJose Antonio Marquez Russo2012-02-23
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Integration
| | | | | | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-23
| | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |