aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-16
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-15
| |\
| | * Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-10
| |\|
| | * Merge pull request #185 from ericguzman/StylesControllerPatchValerio Virgillito2012-05-09
| | |\
| | | * Styles Controller - Fix error when trying dispatch stylesheet change eventEric Guzman2012-05-01
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-07
| |\ \ \
| * | | | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
* | | | | removing first draw on the component eventValerio Virgillito2012-05-16
* | | | | fixing some of the document bindings.Valerio Virgillito2012-05-16
* | | | | Squashed master into dom-architectureValerio Virgillito2012-05-16
* | | | | fixed some binding warningsValerio Virgillito2012-05-15
* | | | | document close handler. initial working draftValerio Virgillito2012-05-15
* | | | | Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-interna...Valerio Virgillito2012-05-14
|\ \ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-14
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #226 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-14
| | |\ \ \ \ \
| | * | | | | | Fixing webRequest URL parsingJose Antonio Marquez2012-05-14
| * | | | | | | Viewport for banner templates so content doesn't push through "body".Nivesh Rajbhandari2012-05-14
| | |/ / / / / | |/| | | | |
| * | | | | | Fixing 3d to work in banner templates.Nivesh Rajbhandari2012-05-14
| |/ / / / /
* / / / / / code cleanupValerio Virgillito2012-05-14
|/ / / / /
* | | | | Adding support for new templatesJose Antonio Marquez2012-05-11
* | | | | Fixing the dirty document flag. Disabling the stylesheets dirty flag because ...Valerio Virgillito2012-05-10
* | | | | Partially fixing the body pi and fixing the selection controllerValerio Virgillito2012-05-10
* | | | | remove console logsValerio Virgillito2012-05-10
* | | | | Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-interna...Valerio Virgillito2012-05-10
|\ \ \ \ \
| * | | | | Adding webRequest APIJose Antonio Marquez2012-05-10
* | | | | | Fixing the google components.Valerio Virgillito2012-05-10
|/ / / / /
* | | | | Adding partial close functionalityJose Antonio Marquez2012-05-10
* | | | | New stage template should not distinguish between user and template body styles.Nivesh Rajbhandari2012-05-10
* | | | | Adding support to save body's css styles on preview.Nivesh Rajbhandari2012-05-09
* | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-08
|\ \ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-08
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | fixed javascript errorsAnanya Sen2012-05-07
| | | |/ / | | |/| |
* | / | | Adding SAVE for I/OJose Antonio Marquez2012-05-08
|/ / / /
* | | | Adding Chrome PreviewJose Antonio Marquez2012-05-08
* | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
|\ \ \ \
| * | | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-04
| |\| | |
| | * | | fixing the currentContainerValerio Virgillito2012-05-03
| | * | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \ \ \
| | * | | | | Refactor creating elements. Removed makeNJElement and separated the model cre...Valerio Virgillito2012-05-03
| | * | | | | Nesting absolute element in the Tag tool. Refactoring element creation and el...Valerio Virgillito2012-05-02
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
|\| | | | |
| * | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-03
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-01
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Preliminary IO to new DOM viewJose Antonio Marquez2012-05-01
* | | | | | Removed special-casing for new template workflow. Instead, we will enforce a...Nivesh Rajbhandari2012-05-04
* | | | | | Fixing selection and layout code to exclude SCRIPT and STYLE tags.Nivesh Rajbhandari2012-05-04
| |_|_|/ / |/| | | |
* | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-03
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | minor formattingValerio Virgillito2012-05-03