aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-10
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
* | | | | | | | | Merge pull request #214 from joseeight/DocumentValerio Virgillito2012-05-10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Adding webRequest API
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-10
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #212 from mencio/dom-architectureValerio Virgillito2012-05-10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Dom architecture - Fixed the live preview for the new template
| | * | | | | | | | | Adding webRequest APIJose Antonio Marquez2012-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding webRequest API to handle local URLs intercepting. Should be a temp fix.
| | | * | | | | | | | Fixing the google components.Valerio Virgillito2012-05-10
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-10
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
* | | | | | | | | | Merge pull request #210 from joseeight/DocumentValerio Virgillito2012-05-10
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | Adding partial close functionality
| * | | | | | | | | Adding partial close functionalityJose Antonio Marquez2012-05-10
|/ / / / / / / / /
| * / / / / / / / Fixing the live preview for the new document.Valerio Virgillito2012-05-10
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | Merge pull request #209 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed 3d body styles bug.
| * | | | | | | | New stage template should not distinguish between user and template body styles.Nivesh Rajbhandari2012-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Draw 3d compass at the bottom-left.Nivesh Rajbhandari2012-05-10
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | Merge pull request #208 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-09
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Adding support to save body's css styles on preview.
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-09
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #207 from joseeight/DocumentValerio Virgillito2012-05-09
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Setting up Montage-Template-Creator
| * | | | | | | | | Temp removing montage clean upJose Antonio Marquez2012-05-09
| | | | | | | | | |
| * | | | | | | | | Preliminary Montage Template CleanupJose Antonio Marquez2012-05-09
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | The template creator is currently not returning serializing code, but does clean the document. Need to investigate reason why, currently all components are removed on save.
* | | | | | | | | Merge pull request #206 from mencio/dom-architectureValerio Virgillito2012-05-09
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Dom architecture - Fixed components
| * | | | | | | | | fixing the components for the new domValerio Virgillito2012-05-09
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * / / / / / / / Adding support to save body's css styles on preview.Nivesh Rajbhandari2012-05-09
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | Merge pull request #204 from joseeight/DocumentValerio Virgillito2012-05-08
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | I/O: Adding Save Functionality
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-08
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Adding SAVE for I/OJose Antonio Marquez2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding save functionality to new template. Need to implement user UI for prompts and also clean up...
* | | | | | | | | | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-08
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * | | | | | | | | Merge pull request #203 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-08
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Get clicked element when body is scrolled. Also fixed zoom code's iframe reference.
| | * | | | | | | | | Get clicked element when body is scrolled.Nivesh Rajbhandari2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-08
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #201 from ericmueller/SnappingValerio Virgillito2012-05-08
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fixes for 2D and 3D translation.
| | * | | | | | | | | Fixed a snapping issue on the mouse down in drawing tools.hwc4872012-05-08
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-08
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | Snapping
| | * | | | | | | | | fixes for 2D and 3D translation.hwc4872012-05-07
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-08
|\| | | | | | | | | | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge pull request #197 from ananyasen/code-editor-patchValerio Virgillito2012-05-08
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Patch to fix code editor issue with latest montage
| | * | | | | | | IKNINJA-1603Ananya Sen2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uncaught TypeError: Cannot read property 'documentRoot' of null js/components/layout/bread-crumb.reel/bread-crumb.js:26 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | fixed javascript errorsAnanya Sen2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <