| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-21 |
| |\ | |||
| | * | 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 |
| | | |\ | |||
| | | * \ | Merge branch 'nested-selection' of github.com:mencio/ninja-internal into ↵ | Valerio Virgillito | 2012-02-20 |
| | | |\ \ | | | | | | | | | | | | | | | | nested-selection | ||
| | | | * | | formatting cleanup | Valerio Virgillito | 2012-02-20 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | 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> | ||
| | * | | | Merge pull request #13 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-21 |
| | |\ \ \ | | | | | | | | | | | FileIO branch pull request | ||
| | | * | | | 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 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | |||
| | | | * | | | Merge pull request #57 from joseeight/CloudFix | Valerio Virgillito | 2012-02-20 |
| | | | |\ \ \ | | | | | | | | | | | | | | | Cloud URL localStorage Fix | ||
| | | | | * | | | 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 |
| | | | | | | |||
| | * | | | | Merge pull request #10 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-18 |
| | |\ \ \ \ | | |/ / / | |/| | | | FileIO branch pull request | ||
| | | | * | | 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> | ||
| | * | | | 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 |
| | | |\ \ \ | | |/ / / | |/| | | | |||
| | | | | * | 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 |
| | | |\| | | |||
| | | * | | | 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 |
| | | |\ \ \ | |||
| | | * | | | | Moving Ninja iFrame templates | Jose Antonio Marquez | 2012-02-16 |
| | | | | | | | |||
| | | * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-16 |
| | | |\ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-16 |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-16 |
| | | |\ \ \ \ \ \ | |||
| | | * | | | | | | | Adding new RDGE library data | Jose Antonio Marquez | 2012-02-16 |
| | | | | | | | | | | |||
| | | | | | | | | * | renamed methods to use better words | Ananya Sen | 2012-02-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | | | | | | * | use method to update dirtyFlag | Ananya Sen | 2012-02-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | | | | | | * | mark document on setting color, properties and stroke. | Ananya Sen | 2012-02-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||