aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge pull request #11 from ericguzman/StylesControllerUpdatesJose Antonio Marquez Russo2012-02-20
|\
| * Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-20
| |\
| | * Cloud URL localStorage FixJose Antonio Marquez2012-02-20
| * | Merge branch 'StylesControllerUpdates' of github.com:ericguzman/ninja-interna...Eric Guzman2012-02-20
| |\ \
| | * | Styles controller - Check for element's window object before querying for mat...Eric Guzman2012-02-20
| | |/
| * / Styles Controller -Fix invalid variable reference when looking for element's ...Eric Guzman2012-02-20
| |/
* | Clean up and repairing manifestJose Antonio Marquez2012-02-19
* | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-18
|\|
| * Merge pull request #55 from mencio/nested-selectionValerio Virgillito2012-02-17
| |\
| | * Re-adding stage mouse wheel scrollingValerio Virgillito2012-02-17
| * | Chrome PreviewJose Antonio Marquez2012-02-17
| * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-17
| |\ \
| | * | Fixing the getStageWorldToGlobalMatrix bugValerio Virgillito2012-02-16
| | |/
* | | doc.markEdited() removed from element-mediator, for style changes, as per tea...Ananya Sen2012-02-18
* | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
|\| |
| * | Adding webRequest redirects for iFrame templatesJose Antonio Marquez2012-02-17
| * | Adding Chrome webRequest interceptJose Antonio Marquez2012-02-17
| * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| |\|
| | * Fixing the selectInput and finishing the textinputValerio Virgillito2012-02-16
| | * Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-16
| | |\
| | | * Merge pull request #50 from mencio/canvas-dataValerio Virgillito2012-02-16
| | | |\
| | | | * Adding a data-RDGE-id attribute to each canvas to save/load canvas dataValerio Virgillito2012-02-16
| | | | * Support for data attributes and adding a random string generatorValerio Virgillito2012-02-16
| | * | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-15
| | |\ \ \
| | * | | | Adding more components piValerio Virgillito2012-02-15
| | * | | | Adding the button and the dropdown control.Valerio Virgillito2012-02-15
| | * | | | fixing the controller to handle all propertiesValerio Virgillito2012-02-14
| | * | | | Completing the anchor elementValerio Virgillito2012-02-14
| | * | | | Adding all the components to the panelValerio Virgillito2012-02-14
| | * | | | 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
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| |\| | | | |
| | * | | | | Merge pull request #46 from ericguzman/PresetsPanelValerio Virgillito2012-02-16
| | |\ \ \ \ \
| | | * | | | | 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 half-baked drag and dropEric Guzman2012-02-13
| | | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Pre...Eric Guzman2012-02-08
| | | |\ \ \ \ \ \ \ \ \ \