aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge pull request #219 from mqg734/TreeFixValerio Virgillito2012-05-11
|\
| * Removing obsolete treeList reference in preset templates.Nivesh Rajbhandari2012-05-11
| * Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
* | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-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
* | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-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
| |/ /
* | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-07
|\| |
| * | 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
| |\ \ \ \ \
| * | | | | | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| * | | | | | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-idValerio Virgillito2012-05-03
| |\ \ \ \ \ \
| | * | | | | | Changing ID to Montage-ID for Color PanelJose Antonio Marquez2012-05-03
| | * | | | | | Changing ID to Montage-ID for Color ComponentsJose Antonio Marquez2012-05-03
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
| |\| | | | |
| * | | | | | Merge pull request #183 from mqg734/data-idValerio Virgillito2012-04-30
| |\ \ \ \ \ \
| | * | | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ...Nivesh Rajbhandari2012-04-30
| * | | | | | | fixing the menu and tool propertiesValerio Virgillito2012-04-30
| |/ / / / / /
| * | | | | | converting the layout folder to use data-montage-idValerio Virgillito2012-04-30
* | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 02:09:32 +0000