| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Temp CSS fix (for file open) | Jose Antonio Marquez | 2012-02-21 |
| | | | | | Implemented temporary work-around to the css-cross-origin issue on files loaded into Ninja. Fix is for open file, need to implement save functionality and integrate with CSS panel. | ||
| * | user document main reel listener moved to the html-document class. | Valerio Virgillito | 2012-02-21 |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵ | Valerio Virgillito | 2012-02-21 |
| |\ | | | | | | | | | | | | | | | | | into file-io Conflicts: js/controllers/document-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | enabling nested selection | Valerio Virgillito | 2012-02-20 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | formatting and removing un-used code from the stage | Valerio Virgillito | 2012-02-20 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | cleanup | Valerio Virgillito | 2012-02-20 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Removing the log of the url requests | Valerio Virgillito | 2012-02-20 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Removing the timeline selection code. | Valerio Virgillito | 2012-02-20 |
| | | | | | | | | | | | | | Timeline selection code is now handled by the selection controller and current container change Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'refs/heads/master' into nested-selection | Valerio Virgillito | 2012-02-20 |
| | |\ | |||
| | * | | formatting cleanup | Valerio Virgillito | 2012-02-20 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | cleanup of the breadcrumb | Valerio Virgillito | 2012-02-20 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | fixing the dirty flag and removing sass changes | Valerio Virgillito | 2012-02-21 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Revert "check cloud availability before open file picker and new file dialogs" | Ananya Sen | 2012-02-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3251315ecc22544dab50623ee5862e00dfe02302. Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-20 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * \ \ | Merge pull request #11 from ericguzman/StylesControllerUpdates | Jose Antonio Marquez Russo | 2012-02-20 |
| | |\ \ \ | | | | | | | | | | | Styles controller updates | ||
| | | * \ \ | Merge branch 'refs/heads/master' into StylesControllerUpdates | Eric Guzman | 2012-02-20 |
| | | |\ \ \ | | | | |/ | | | |/| | |||
| | | | * | | Cloud URL localStorage Fix | Jose Antonio Marquez | 2012-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 Guzman | 2012-02-20 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | github.com:ericguzman/ninja-internal into StylesControllerUpdates | ||
| | | | * | | | Styles controller - Check for element's window object before querying for ↵ | Eric Guzman | 2012-02-20 |
| | | | |/ / | | | | | | | | | | | | | | | | matching css rules. | ||
| | | * / / | Styles Controller -Fix invalid variable reference when looking for element's ↵ | Eric Guzman | 2012-02-20 |
| | | |/ / | | | | | | | | | | | | | window object | ||
| | * | | | Clean up and repairing manifest | Jose Antonio Marquez | 2012-02-19 |
| | | | | | |||
| * | | | | check cloud availability before open file picker and new file dialogs | Ananya Sen | 2012-02-20 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | - moved tools specific keyboard controls for desing view only | Ananya Sen | 2012-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 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> | ||
| | * | | Chrome Preview | Jose Antonio Marquez | 2012-02-17 |
| | | | | |||
| | * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-17 |
| | |\ \ | |||
| | | * | | 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 |
| | | | | |||
| | * | | 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 |
| | |\| | |||
| | | * | Fixing the selectInput and finishing the textinput | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | | | | | 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 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> | ||
| | | * | | | | 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 |
| | |\| | | | | | |||