aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-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
| |\
| * | fixes for 2D and 3D translation.hwc4872012-05-07
* | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-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
| |/
* | Merge pull request #202 from joseeight/DocumentValerio Virgillito2012-05-08
|\ \
| * | Adding Chrome PreviewJose Antonio Marquez2012-05-08
* | | Stage should update scroll offsets when scrolled. Note that this is not alway...Nivesh Rajbhandari2012-05-08
|/ /
* | Moving webGL to own helper classJose Antonio Marquez2012-05-07
* | Extracting CSS methods to parsing class.Jose Antonio Marquez2012-05-07
* | Adding webGL support for opening filesJose Antonio Marquez2012-05-07
* | Temporarily skipping activeDocument.currentView check so keyboard shortcuts s...Nivesh Rajbhandari2012-05-04
* | Fixing references to iframe's styles in new template.Nivesh Rajbhandari2012-05-04
* | Draw 3d grid by default since app model is not hooked up yet.Nivesh Rajbhandari2012-05-04
* | 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 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
* | | | | | | | Fixing body's default styles.Nivesh Rajbhandari2012-05-04
* | | | | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
|\| | | | | | |
| * | | | | | | Clean up, ready for alpha check-inJose Antonio Marquez2012-05-03
| * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-03
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Full CSS support on openJose Antonio Marquez2012-05-03
| * | | | | | | Reloading local stylesheetsJose Antonio Marquez2012-05-03