aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-31
|\
| * Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-24
| |\
| | * Fixed selection bug when switching/opening documents. Also, use saved scroll ...Nivesh Rajbhandari2012-05-24
| | * fixing the styles manager to open code view files and closing the last document.Valerio Virgillito2012-05-23
| | * Merge pull request #252 from ananyasen/dom-architectureValerio Virgillito2012-05-23
| | |\
| | | * Merge branch 'refs/heads/master-dom-architecture' into dom-architectureAnanya Sen2012-05-22
| | | |\
| | | * | - don't redraw stage for code document - fixes a switching bugAnanya Sen2012-05-22
| * | | | Some clean up, adding commentsJose Antonio Marquez2012-05-24
| * | | | Renaming variable as it will now be usedJose Antonio Marquez2012-05-24
| * | | | Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
| * | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-23
| |\| | |
| | * | | improve the closing of documents.Valerio Virgillito2012-05-23
| | * | | CSS Panel - Merged Styles controller from DOM ArchitectureEric Guzman2012-05-22
| | * | | Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-interna...Eric Guzman2012-05-22
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-interna...Eric Guzman2012-05-18
| | |\ \ \
| | * | | | Style sheets - Add support for removing default style sheetEric Guzman2012-05-18
| | * | | | CSS Panel - Add support for deleting style sheetsEric Guzman2012-05-18
| | * | | | Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-interna...Eric Guzman2012-05-17
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-17
| | |\ \ \ \ \
| | * | | | | | Styles Controller - Null out active documentEric Guzman2012-05-17
| | * | | | | | CSS Panel - Style sheets dirty flag addedEric Guzman2012-05-16
| | * | | | | | Styles Controller - Fix issue with clearing dirty stylesheet listEric Guzman2012-05-16
| | * | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-10
| | |\ \ \ \ \ \
| | * | | | | | | Styles Controller - Added fix for setting style on cached, multi-target rule.Eric Guzman2012-05-09
| | * | | | | | | Style sheets - Add sheet actionEric Guzman2012-05-07
| | * | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-02
| | |\ \ \ \ \ \ \
| | * | | | | | | | Styles Controller - Fix error when trying dispatch stylesheet change eventEric Guzman2012-05-01
| | * | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-01
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-30
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-26
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-05
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-04
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-04
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-02
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | CSS Panel - Updating components, created toolbar components, and small change...Eric Guzman2012-03-02
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-02-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-02-27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-02-22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | CSS Panel UpdateEric Guzman2012-02-22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | fixing the selection in multiple documents and some code cleanupValerio Virgillito2012-05-22
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * / | | | | | | | | | | | | | | | | | | | | | | | | Adding redirect from app folder in templatesJose Antonio Marquez2012-05-22
| |/ / / / / / / / / / / / / / / / / / / / / / / / /