aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-20
|\ | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Merge pull request #11 from ericguzman/StylesControllerUpdatesJose Antonio Marquez Russo2012-02-20
| |\ | | | | | | Styles controller updates
| | * Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-20
| | |\
| | | * Cloud URL localStorage FixJose Antonio Marquez2012-02-20
| | | | | | | | | | | | | | | | Fixed logic to remember and display the previously used URL for local cloud if not started on Ninja load.
| | * | Merge branch 'StylesControllerUpdates' of ↵Eric Guzman2012-02-20
| | |\ \ | | | | | | | | | | | | | | | github.com:ericguzman/ninja-internal into StylesControllerUpdates
| | | * | Styles controller - Check for element's window object before querying for ↵Eric Guzman2012-02-20
| | | |/ | | | | | | | | | | | | matching css rules.
| | * / Styles Controller -Fix invalid variable reference when looking for element's ↵Eric Guzman2012-02-20
| | |/ | | | | | | | | | window object
| * | Clean up and repairing manifestJose Antonio Marquez2012-02-19
| | |
* | | check cloud availability before open file picker and new file dialogsAnanya Sen2012-02-20
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | - moved tools specific keyboard controls for desing view onlyAnanya Sen2012-02-20
|/ / | | | | | | | | | | - stopped snapping when all documents are closed Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-18
|\| | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * 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>
* | | doc.markEdited() removed from element-mediator, for style changes, as per ↵Ananya Sen2012-02-18
| | | | | | | | | | | | | | | | | | teams suggestion Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@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
| | | |\ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:15:46 +0000