| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-23 |
| |\ | |||
| | * | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-22 |
| | |\ | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/controllers/styles-controller.js | ||
| | * \ | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-18 |
| | |\ \ | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates | ||
| | * | | | CSS Panel - Add highlight CSS class to template file | Eric Guzman | 2012-05-17 |
| | | | | | |||
| * | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-22 |
| |\ \ \ \ | | |_|/ | |/| | | |||
| | * | | | fixing the selection in multiple documents and some code cleanup | Valerio Virgillito | 2012-05-22 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-22 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | Linear & radial gradients for runtime fixes | hwc487 | 2012-05-17 |
| | | | | | | |||
| * | | | | | Adding redirect from app folder in templates | Jose Antonio Marquez | 2012-05-22 |
| |/ / / / | | | | | | | | | | | | | This doesn't resolve the issue of XHR requests made in Montage. | ||
| * | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-22 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js | ||
| | * | | | | fixing a few document switching issues. | Valerio Virgillito | 2012-05-22 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | - added opening multiple code and design view documents | Ananya Sen | 2012-05-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - switching between multiple code and design view documents - Note: closing of documents, when multiple documents are open, is not yet implemented Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | use documents parent container property | Ananya Sen | 2012-05-20 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | save for code view documents in the new dom architecture | Ananya Sen | 2012-05-18 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/master-dom-architecture' into dom-architecture | Ananya Sen | 2012-05-18 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||
| | * | | | | integrated open code view document in new dom architecture | Ananya Sen | 2012-05-18 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | Minor bug fix | Jose Antonio Marquez | 2012-05-22 |
| | | | | | | | | | | | | | | | | | | | | | No longer using webgl attribute names, instead using canvas to be more consistent and allow for better term usage across canvas 2D and RDGE. | ||
| * | | | | | Adding support for reading webgl external files | Jose Antonio Marquez | 2012-05-22 |
| | | | | | | | | | | | | | | | | | | | | | For author-time, run-time is already checked in and supported. | ||
| * | | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-21 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||
| | * | | | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-18 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| | * | | | | | fixing the color chip for the document root | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | Clean up and adding TODOs | Jose Antonio Marquez | 2012-05-18 |
| | |/ / / / |/| | | | | |||
| * | | | | | Fixing save logic | Jose Antonio Marquez | 2012-05-18 |
| | | | | | | | | | | | | | | | | | | | | | Moved dirty marker clearing code to model. | ||
| * | | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-18 |
| |\| | | | | |||
| | * | | | | fixing a scrolling issue when multiple documents are switched | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-18 |
| |\| | | | | |||
| | * | | | | enabling basic document switching | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-17 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| | * | | | | multiple documents - enable opening multiple documents and initial switching | Valerio Virgillito | 2012-05-17 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Adding component initialization on open | Jose Antonio Marquez | 2012-05-17 |
| | |/ / / |/| | | | | | | | | | | | This is for opening components, selection is still not reflecting component data. | ||
| * | | | | Sharing app data in banner and html templates | Jose Antonio Marquez | 2012-05-17 |
| |/ / / | | | | | | | | | | Syncing the files to avoid duplicates and ensure consistency. | ||
| * | | | Fixed chrome preview for banner templates. | Nivesh Rajbhandari | 2012-05-17 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-17 |
| |\| | | |||
| | * | | document controller and stage view code cleanup | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-16 |
| | |\ \ | |||
| | * | | | Fixing serialization referencing (new object per save) | Jose Antonio Marquez | 2012-05-16 |
| | | | | | |||
| | * | | | Adding basic montage components I/O | Jose Antonio Marquez | 2012-05-16 |
| | | | | | | | | | | | | | | | | | Only for saving basic components without a reel. | ||
| * | | | | Adding default padding for banner templates. | Nivesh Rajbhandari | 2012-05-17 |
| | |/ / |/| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-16 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Squashed commit of google-components into master | Valerio Virgillito | 2012-05-09 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Fixing selection bugs in new templates. | Nivesh Rajbhandari | 2012-05-16 |
| | |/ |/| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Fixing preview bug | Jose Antonio Marquez | 2012-05-16 |
| | | | | | | | | | Also setting up for Montage component serialization. | ||
| * | | Fixing the package file for the new dom template | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Squashed master into dom-architecture | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-15 |
| |\ \ | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| | * | | Adding special preview for templates | Jose Antonio Marquez | 2012-05-15 |
| | | | | |||
| * | | | document close handler. initial working draft | Valerio Virgillito | 2012-05-15 |
| |/ / | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Fixing overflow on open for template documents | Jose Antonio Marquez | 2012-05-15 |
| | | | |||
| * | | File save for banner template | Jose Antonio Marquez | 2012-05-15 |
| | | | | | | | | | Adding file save for templates, completing I/O. | ||
| * | | Finalizing open for new banner templates | Jose Antonio Marquez | 2012-05-15 |
| | | | | | | | | | Moving to implement save. | ||