Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-18 |
|\ | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates | ||
| * | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-18 |
| |\ | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| | * | Fixing save logic | Jose Antonio Marquez | 2012-05-18 |
| | | | | | | | | | | | | Moved dirty marker clearing code to model. | ||
| * | | fixing the color chip for the document root | Valerio Virgillito | 2012-05-18 |
| |/ | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | fixed a switch documents bug where the layout was getting called before ↵ | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | | | | | setting the container. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Fixing the save as paths | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | enabling basic document switching | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | multiple documents - enable opening multiple documents and initial switching | Valerio Virgillito | 2012-05-17 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Style sheets - Add support for removing default style sheet | Eric Guzman | 2012-05-18 |
| | | |||
* | | CSS Panel - Add support for deleting style sheets | Eric Guzman | 2012-05-18 |
| | | |||
* | | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-17 |
|\| | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/document/templates/montage-html/default_html.css js/lib/NJUtils.js | ||
| * | document controller and stage view code cleanup | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | code cleanup and refactoring of the document controller and stage view | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | clearing the needs save flag on save. | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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> | ||
| * | | removing first draw on the component event | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | fixing some of the document bindings. | 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> | ||
| * | | fixed some binding warnings | Valerio Virgillito | 2012-05-15 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | document close handler. initial working draft | Valerio Virgillito | 2012-05-15 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-14 |
| |\ \ | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| | * \ | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-14 |
| | |\ \ | |||
| | | * \ | Merge pull request #226 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-14 |
| | | |\ \ | | | | | | | | | | | | | Fixing 3d to work in banner templates. | ||
| | | * | | | Fixing webRequest URL parsing | Jose Antonio Marquez | 2012-05-14 |
| | | | | | | |||
| | * | | | | Viewport for banner templates so content doesn't push through "body". | Nivesh Rajbhandari | 2012-05-14 |
| | | |/ / | | |/| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Fixing 3d to work in banner templates. | Nivesh Rajbhandari | 2012-05-14 |
| | |/ / | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * / / | code cleanup | Valerio Virgillito | 2012-05-14 |
| |/ / | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Adding support for new templates | Jose Antonio Marquez | 2012-05-11 |
| | | | | | | | | | | | | This is supported for NEW and OPEN, SAVE is not supported yet by I/O. Saving works, but it will not be a banner template. | ||
| * | | Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵ | Valerio Virgillito | 2012-05-10 |
| | | | | | | | | | | | | | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Partially fixing the body pi and fixing the selection controller | Valerio Virgillito | 2012-05-10 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | remove console logs | Valerio Virgillito | 2012-05-10 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-10 |
| |\ \ | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| | * | | Adding webRequest API | Jose Antonio Marquez | 2012-05-10 |
| | | | | | | | | | | | | | | | | Adding webRequest API to handle local URLs intercepting. Should be a temp fix. | ||
| * | | | Fixing the google components. | Valerio Virgillito | 2012-05-10 |
| |/ / | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Adding partial close functionality | Jose Antonio Marquez | 2012-05-10 |
| | | | |||
| * | | New stage template should not distinguish between user and template body styles. | Nivesh Rajbhandari | 2012-05-10 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Adding support to save body's css styles on preview. | Nivesh Rajbhandari | 2012-05-09 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-08 |
| |\ \ | |||
| | * \ | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-08 |
| | |\ \ | |||
| * | | | | Adding SAVE for I/O | Jose Antonio Marquez | 2012-05-08 |
| |/ / / | | | | | | | | | | | | | Adding save functionality to new template. Need to implement user UI for prompts and also clean up... | ||
| * | | | Adding Chrome Preview | Jose Antonio Marquez | 2012-05-08 |
| | | | | |||
| * | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-04 |
| |\ \ \ | |||
| | * \ \ | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-04 |
| | |\ \ \ | |||
| * | | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-04 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-web/default_html.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-03 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-01 |
| | |\ \ \ \ \ | |||
| | * | | | | | | Preliminary IO to new DOM view | Jose Antonio Marquez | 2012-05-01 |
| | | | | | | | | |||
| * | | | | | | | Removed special-casing for new template workflow. Instead, we will enforce ↵ | Nivesh Rajbhandari | 2012-05-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a width and height on the body in order to do 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | Fixing selection and layout code to exclude SCRIPT and STYLE tags. | Nivesh Rajbhandari | 2012-05-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-17 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | |