| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Clean up and repairing manifest | Jose Antonio Marquez | 2012-02-19 |
| | | |||
| * | Merge pull request #10 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-18 |
| |\ | | | | | FileIO branch pull request | ||
| | * | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-18 |
| | |\ | |/ |/| | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Merge pull request #55 from mencio/nested-selection | Valerio Virgillito | 2012-02-17 |
| |\ \ | | | | | | | Re-adding stage mouse wheel scrolling | ||
| | * | | Re-adding stage mouse wheel scrolling | Valerio Virgillito | 2012-02-17 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Merge pull request #54 from joseeight/TabPreview | Valerio Virgillito | 2012-02-17 |
| |\ \ \ | | | | | | | | | Tab preview | ||
| | * \ \ | Merge branch 'refs/heads/NinjaInternal' into TabPreview | Jose Antonio Marquez | 2012-02-17 |
| | |\ \ \ | |/ / / |/| | | | |||
| * | | | | Merge pull request #53 from joseeight/FileIO | Valerio Virgillito | 2012-02-17 |
| |\ \ \ \ | | | | | | | | | | | File IO local files webRequest redirect | ||
| | | * | | | Chrome Preview | Jose Antonio Marquez | 2012-02-17 |
| | |/ / / | |||
| | * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-17 |
| | |\ \ \ | |/ / / |/| | | | |||
| * | | | | Merge branch 'refs/heads/stage-matrix-issue' | Valerio Virgillito | 2012-02-17 |
| |\ \ \ \ | |_|/ / |/| | | | |||
| | * | | | Merge pull request #52 from mencio/stage-matrix-fix | Valerio Virgillito | 2012-02-16 |
| | |\ \ \ | | | | | | | | | | | Fixing the getStageWorldToGlobalMatrix bug | ||
| | | * | | | Fixing the getStageWorldToGlobalMatrix bug | Valerio Virgillito | 2012-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 Sen | 2012-02-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | teams suggestion Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | * | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-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 templates | Jose Antonio Marquez | 2012-02-17 |
| | | | | | |||
| | | * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-17 |
| | | |\ \ | |_|/ / |/| | | | |||
| * | | | | fixed typo | Valerio Virgillito | 2012-02-17 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | initial commit of the Ninja readme file | Valerio Virgillito | 2012-02-17 |
| |/ / / | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Adding Chrome webRequest intercept | Jose Antonio Marquez | 2012-02-17 |
| | | | | | | | | | | | | | Need to add logic to resolve file's actual URL dynamically. | ||
| | * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-16 |
| | |\ \ | |/ / |/| | | |||
| * | | | Merge pull request #51 from mencio/components | Valerio Virgillito | 2012-02-16 |
| |\ \ \ | | | | | | | | | Fixing the components not instantianting in the user document | ||
| | * | | | Fixing the selectInput and finishing the textinput | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Fixing the component loading error. | Valerio Virgillito | 2012-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 components | Valerio Virgillito | 2012-02-16 |
| | |\ \ \ | |/ / / |/| | | | |||
| * | | | | Merge pull request #50 from mencio/canvas-data | Valerio Virgillito | 2012-02-16 |
| |\ \ \ \ | | | | | | | | | | | Adding canvas data attributes | ||
| | * | | | | Adding a data-RDGE-id attribute to each canvas to save/load canvas data | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Support for data attributes and adding a random string generator | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Merge pull request #49 from mayhewinator/WorkingBranch | mayhewinator | 2012-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 Mayhew | 2012-02-16 |
| | |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | WorkingBranch | ||
| | * | | | | | Updated the update url in our manifest file to point to our internal server. | John Mayhew | 2012-02-16 |
| | | | | | | | |||
| | | | * | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-15 |
| | | | |\ \ \ | |||
| | | | * | | | | Adding more components pi | Valerio Virgillito | 2012-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 Virgillito | 2012-02-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | | fixing the controller to handle all properties | Valerio Virgillito | 2012-02-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | | Completing the anchor element | Valerio Virgillito | 2012-02-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | | Adding all the components to the panel | Valerio Virgillito | 2012-02-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | | Removing the old and obsolete ninja components | Valerio Virgillito | 2012-02-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-14 |
| | | | |\ \ \ \ | |||
| | | | | | | * | | Moving Ninja iFrame templates | Jose Antonio Marquez | 2012-02-16 |
| | | | | | | | | | |||
| | | | | | | * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-16 |
| | | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||
| * | | | | | | | | Fixing the preset panel undefined property for the menu model. | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | | | | * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-16 |
| | | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||
| * | | | | | | | | Merge pull request #46 from ericguzman/PresetsPanel | Valerio Virgillito | 2012-02-16 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Presets panel initial merge into master | ||
| | * | | | | | | | | Presets Panel - Move to bottom, add to menu | Eric Guzman | 2012-02-16 |
| | | | | | | | | | | |||
| | * | | | | | | | | Merge branch 'refs/heads/master' into PresetsPanel | Eric Guzman | 2012-02-16 |
| | |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | Presets - Minor CSS text-shadow work-around for Windows Chrome | Eric Guzman | 2012-02-16 |
| | | | | | | | | | | | |||
| | * | | | | | | | | | Merge branch 'refs/heads/master' into PresetsPanel | Eric Guzman | 2012-02-16 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||
| | * | | | | | | | | | Merge branch 'refs/heads/TreeComponents' into PresetsPanel | Eric Guzman | 2012-02-16 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | Presets - Get/set active tab from local storage + other improvements | Eric Guzman | 2012-02-15 |
| | | | | | | | | | | | | |||