aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| * | | | | | Revert "Cleaning up"Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a7952c5a16e2cae3fd1a459b03b9f16bba1004da. Conflicts: js/controllers/document-controller.js js/io/document/text-document.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | Revert "Reverting text/html document classes and setting up MVC folder ↵Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | Revert "Creating NinjaTemplate to HTML function"Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | 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>
| * | | | | Chrome PreviewJose Antonio Marquez2012-02-17
| | | | | |
| * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-17
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | 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
| | | | |
| * | | | 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
| |\| | |
| | * | | Fixing the selectInput and finishing the textinputValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | 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 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>
| | * | | | | | 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
| | | | | | | | | | | |
| | | * | | | | | | | | Presets - Add external json file with transition dataEric Guzman2012-02-15
| | | | | | | | | | | |
| | | * | | | | | | | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-13
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Style Presets - Separate out the style preset data to new fileEric Guzman2012-02-13
| | | | | | | | | | | | |
| | | * | | | | | | | | | Merge branch 'refs/heads/TreeComponents' into PresetsPanelEric Guzman2012-02-13
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-13
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Presets - Committing