| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-05-25 |
| |\ | |||
| | * | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-25 |
| | |\ | |||
| | | * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-24 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js | ||
| | | | * | Fixed selection bug when switching/opening documents. Also, use saved scroll ↵ | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | fixing the styles manager to open code view files and closing the last document. | Valerio Virgillito | 2012-05-23 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Some clean up, adding comments | Jose Antonio Marquez | 2012-05-24 |
| | | | | | | | | | | | | | | | | | This obviously needs much work and reworking... | ||
| | | * | | Renaming variable as it will now be used | Jose Antonio Marquez | 2012-05-24 |
| | | | | | | | | | | | | | | | | | This is no longer a temp fix, it might be a permanent boolean to open/close web-request API gates. | ||
| | | * | | Cleaning up referencing to 'documentRoot' and '_document' | Jose Antonio Marquez | 2012-05-24 |
| | | | | | | | | | | | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view. | ||
| | | * | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-23 |
| | | |\ \ | |||
| | | * \ \ | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-22 |
| | | |\ \ \ | |||
| | | * | | | | 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. | ||
| * | | | | | | Objects Controller - Now keeps track of document's object instances, ↵ | Eric Guzman | 2012-05-25 |
| |/ / / / / | | | | | | | | | | | | | | | | including added components | ||
| * | | | | | Merge branch 'refs/heads/dom-architecture' into binding | Armen Kesablyan | 2012-05-23 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | Merge pull request #252 from ananyasen/dom-architecture | Valerio Virgillito | 2012-05-23 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | bug fixes | ||
| | | * | | | Merge branch 'refs/heads/master-dom-architecture' into dom-architecture | Ananya Sen | 2012-05-22 |
| | | |\ \ \ | | | | |/ | | | |/| | |||
| | | * | | | - don't redraw stage for code document - fixes a switching bug | Ananya Sen | 2012-05-22 |
| | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | - fix for ctrl+S for code document - disallow opening the panels while in code document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | improve the closing of documents. | Valerio Virgillito | 2012-05-23 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | CSS Panel - Merged Styles controller from DOM Architecture | Eric Guzman | 2012-05-22 |
| | | | | | |||
| | * | | | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-22 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/controllers/styles-controller.js | ||
| | | * | | fixing the selection in multiple documents and some code cleanup | Valerio Virgillito | 2012-05-22 |
| | | |/ | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | fixing a few document switching issues. | Valerio Virgillito | 2012-05-22 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | - fixed save as | Ananya Sen | 2012-05-21 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@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> | ||
| | | * | 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> | ||
| | * | | | 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 | ||
| | * | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-17 |
| | |\ \ | |||
| | * | | | Styles Controller - Null out active document | Eric Guzman | 2012-05-17 |
| | | | | | |||
| | * | | | CSS Panel - Style sheets dirty flag added | Eric Guzman | 2012-05-16 |
| | | | | | |||
| | * | | | Styles Controller - Fix issue with clearing dirty stylesheet list | Eric Guzman | 2012-05-16 |
| | | | | | |||
| | * | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-10 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | ||
| | * | | | | Styles Controller - Added fix for setting style on cached, multi-target rule. | Eric Guzman | 2012-05-09 |
| | | | | | | | | | | | | | | | | | | | | | Added fix for setting style on cached, multi-target rule. Also added parameter to selector override to augment specificity of selector | ||
| | * | | | | Style sheets - Add sheet action | Eric Guzman | 2012-05-07 |
| | | | | | | |||
| | * | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-02 |
| | |\ \ \ \ | |||
| | * | | | | | Styles Controller - Fix error when trying dispatch stylesheet change event | Eric Guzman | 2012-05-01 |
| | | | | | | | |||
| | * | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-01 |
| | |\ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-30 |
| | |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-26 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-23 |
| | |\ \ \ \ \ \ \ \ | |||