| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'dom-architecture' of ↵ | Armen Kesablyan | 2012-05-15 |
| |\ | | | | | | | github.com:Motorola-Mobility/ninja-internal into binding | ||
| | * | 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/masterDomArc' into binding | Armen Kesablyan | 2012-05-14 |
| |\ \ \ | |/ / |/| | | |||
| | * | | Removing outdated tree-controller. | Nivesh Rajbhandari | 2012-05-11 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge pull request #185 from ericguzman/StylesControllerPatch | Valerio Virgillito | 2012-05-09 |
| | |\ \ | | |/ | |/| | Styles Controller - Fix error when trying dispatch stylesheet change eve... | ||
| | | * | Styles Controller - Fix error when trying dispatch stylesheet change event | Eric Guzman | 2012-05-01 |
| | | | | |||
| | * | | fixed javascript errors | Ananya Sen | 2012-05-07 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | 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 |
| | |\| | | |||
| | | * | | fixing the currentContainer | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 |
| | | |\ \ | |||
| | | * \ \ | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | Refactor creating elements. Removed makeNJElement and separated the model ↵ | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | Nesting absolute element in the Tag tool. Refactoring element creation and ↵ | Valerio Virgillito | 2012-05-02 |
| | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | 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/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-03 |
| |\ \ \ \ | | |_|/ | |/| | | |||
| | * | | | minor formatting | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Dom Manipulation | Kruti Shah | 2012-05-03 |
| | | |/ | |/| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-01 |
| |\| | | |||
| | * | | Get working plane grid to draw for new stage web template workflow. | Nivesh Rajbhandari | 2012-05-01 |
| | |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Squashed commit of stage architecture | Valerio Virgillito | 2012-04-30 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-26 |
| | |\ | |||
| | * | | Added a body controller | Valerio Virgillito | 2012-04-24 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | added shortkeys for commenting and uncomment | Ananya Sen | 2012-04-30 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | IKNINJA-1537 - don't show code hinting for ctrl+S | Ananya Sen | 2012-04-30 |
| | | | | | | | | | | | | | | | | | | | IKNINJA-1568 - code hinting not supported for son files Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||