aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵Nivesh Rajbhandari2012-02-22
| | | | | | materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Updated Materials Library and Materials Editor Popup to work with latest ↵mqg7342012-02-21
| | | | | | | | version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error.
* Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
|\
| * Merge pull request #55 from mencio/nested-selectionValerio Virgillito2012-02-17
| |\ | | | | | | Re-adding stage mouse wheel scrolling
| | * Re-adding stage mouse wheel scrollingValerio Virgillito2012-02-17
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge pull request #54 from joseeight/TabPreviewValerio Virgillito2012-02-17
| |\ \ | | | | | | | | Tab preview
| | * \ Merge branch 'refs/heads/NinjaInternal' into TabPreviewJose Antonio Marquez2012-02-17
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #53 from joseeight/FileIOValerio Virgillito2012-02-17
| |\ \ \ | | | | | | | | | | File IO local files webRequest redirect
| | | * | Chrome PreviewJose Antonio Marquez2012-02-17
| | |/ /
| | * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-17
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'refs/heads/stage-matrix-issue'Valerio Virgillito2012-02-17
| |\ \ \ | | |_|/ | |/| |
| | * | Merge pull request #52 from mencio/stage-matrix-fixValerio Virgillito2012-02-16
| | |\ \ | | | | | | | | | | Fixing the getStageWorldToGlobalMatrix bug
| | | * | Fixing the getStageWorldToGlobalMatrix bugValerio Virgillito2012-02-16
| | |/ / | | | | | | | | | | | | | | | | | | | | removing the snapManager reference in viewUtils Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Adding webRequest redirects for iFrame templatesJose Antonio Marquez2012-02-17
| | | |
| | | * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-17
| | | |\ | | |_|/ | |/| |
| * | | fixed typoValerio Virgillito2012-02-17
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | initial commit of the Ninja readme fileValerio Virgillito2012-02-17
| |/ / | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Adding Chrome webRequest interceptJose Antonio Marquez2012-02-17
| | | | | | | | | | | | Need to add logic to resolve file's actual URL dynamically.
| | * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| | |\ | | |/ | |/|
| * | Merge pull request #51 from mencio/componentsValerio Virgillito2012-02-16
| |\ \ | | | | | | | | Fixing the components not instantianting in the user document
| | * | Fixing the selectInput and finishing the textinputValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Fixing the component loading error.Valerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | Removing the deserializedFromTemplate which was causing the component not to load. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-16
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #50 from mencio/canvas-dataValerio Virgillito2012-02-16
| |\ \ \ | | | | | | | | | | Adding canvas data attributes
| | * | | Adding a data-RDGE-id attribute to each canvas to save/load canvas dataValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Support for data attributes and adding a random string generatorValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge pull request #49 from mayhewinator/WorkingBranchmayhewinator2012-02-16
| |\ \ \ \ | | | | | | | | | | | | Updated manifest.json to use our internal update server for daily builds
| | * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-16
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | WorkingBranch
| | * | | | Updated the update url in our manifest file to point to our internal server.John Mayhew2012-02-16
| | | | | |
| | | | * | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-15
| | | | |\ \
| | | | * | | Adding more components piValerio Virgillito2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added rest of the components pi. Missing text-input and select Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | | Adding the button and the dropdown control.Valerio Virgillito2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | | fixing the controller to handle all propertiesValerio Virgillito2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | | Completing the anchor elementValerio Virgillito2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | | Adding all the components to the panelValerio Virgillito2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | | Removing the old and obsolete ninja componentsValerio Virgillito2012-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-14
| | | | |\ \ \
| | | | | | | * Moving Ninja iFrame templatesJose Antonio Marquez2012-02-16
| | | | | | | |
| | | | | | | * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fixing the preset panel undefined property for the menu model.Valerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | | | * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #46 from ericguzman/PresetsPanelValerio Virgillito2012-02-16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Presets panel initial merge into master
| | * | | | | | | Presets Panel - Move to bottom, add to menuEric Guzman2012-02-16
| | | | | | | | |
| | * | | | | | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-16
| | |\ \ \ \ \ \ \
| | * | | | | | | | Presets - Minor CSS text-shadow work-around for Windows ChromeEric Guzman2012-02-16
| | | | | | | | | |
| | * | | | | | | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-16
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'refs/heads/TreeComponents' into PresetsPanelEric Guzman2012-02-16
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Presets - Get/set active tab from local storage + other improvementsEric Guzman2012-02-15
| | | | | | | | | | |
| | * | | | | | | | | Presets - Modify application of preset classes for new json structureEric Guzman2012-02-15
| | | | | | | | | | |
| | * | | | | | | | | Presets - Modify structure of preset dataEric Guzman2012-02-15
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 06:51:19 +0000