aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | 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/timeline-local' into TimelineUberJonathan Duran2012-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Bug fixes for deleting elements.Jon Reid2012-05-18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Fix element insertion to use new TimelinePanel properties andJon Reid2012-05-18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Multiselect improvements. New convenience methods. MultiselectJon Reid2012-05-17
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-05-15
|\| | | | | | | | | | | | | | | | | | | | | | |