aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-11
|\
| * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-10
| |\
| * \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-08
| |\ \
| * \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-07
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-03
| |\ \ \ \
| * | | | | Converting canvas runtime to use prototypes for geom obj, rectangle, oval and...Nivesh Rajbhandari2012-05-03
| * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-03
| |\ \ \ \ \
| * | | | | | Converting geom-obj to object literal notation.Nivesh Rajbhandari2012-05-02
| * | | | | | Converting line, circle and rectangle shapes to object literal notation.Nivesh Rajbhandari2012-05-02
* | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-10
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-05-09
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #185 from ericguzman/StylesControllerPatchValerio Virgillito2012-05-09
| | |\ \ \ \ \ \
| | | * | | | | | Styles Controller - Fix error when trying dispatch stylesheet change eventEric Guzman2012-05-01
| * | | | | | | | some code cleanupValerio Virgillito2012-05-09
| |/ / / / / / /
| * | | | | | / Squashed commit of google-components into masterValerio Virgillito2012-05-09
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fixed an inaccuracy snapping to the stage.hwc4872012-05-10
* | | | | | | code cleanup for linear gradients.hwc4872012-05-08
* | | | | | | WebGL linear gradients to match CSShwc4872012-05-08
* | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-08
|\| | | | | |
| * | | | | | 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 Sna...hwc4872012-05-08
| |\ \ \ \ \ \
| | * | | | | | IKNINJA-1603Ananya Sen2012-05-08
| | * | | | | | fixed javascript errorsAnanya Sen2012-05-07
| | * | | | | | removed incorrect id selector css for code view container since its breaking it.Ananya Sen2012-05-07
| | | |_|_|_|/ | | |/| | | |
| * / | | | | fixes for 2D and 3D translation.hwc4872012-05-07
| |/ / / / /
* / / / / / Radial gradients to match CSShwc4872012-05-08
|/ / / / /
* | | | | Fixing the color popupValerio Virgillito2012-05-04
* | | | | temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
* | | | | fixing the currentContainerValerio Virgillito2012-05-03
* | | | | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio 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
| * | | | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Nesting absolute element in the Tag tool. Refactoring element creation and el...Valerio Virgillito2012-05-02
| * | | | | code cleanupValerio Virgillito2012-05-02
| | |_|_|/ | |/| | |
* | | | | Removing unused components referencesValerio Virgillito2012-05-03
* | | | | Fixing the lock button cssValerio Virgillito2012-05-03
* | | | | finishing to replace all id with data-montage-idValerio Virgillito2012-05-03
* | | | | Removing more id and changing the appropriate CSS for themValerio Virgillito2012-05-03
* | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Code reformattingValerio Virgillito2012-05-03
| * | | | Merge pull request #192 from ananyasen/Codeview-improvementsValerio Virgillito2012-05-03
| |\ \ \ \
| | * | | | using prototype in the serializationAnanya Sen2012-05-03
| | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-03
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-02
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | removing format button for now until fully implementedAnanya Sen2012-05-02
| | * | | | disable format button for nowAnanya Sen2012-05-01
| | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| | |\ \ \ \ | | | | |_|/ | | | |/| |