aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-06
|\
| * integrated save for the document tabs, detect codemirror history to show docu...Ananya Sen2012-02-06
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\ \
| * \ Merge pull request #16 from ericguzman/TreeComponentsValerio Virgillito2012-02-06
| |\ \
| | * | TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | * | Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | * | Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | * | Tree Controller - Initial addEric Guzman2012-02-06
* | | | Adding logic to copy ninja librariesJose Antonio Marquez2012-02-06
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\| | |
| * | | Merge pull request #15 from mqg734/ToolFixesValerio Virgillito2012-02-06
| |\ \ \
| | * | | Fixing format of for loop.Nivesh Rajbhandari2012-02-06
| | * | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-06
| | |\| |
| | * | | We were only updating the first custom section in the PI.Nivesh Rajbhandari2012-02-03
| | * | | Update element planes after shapes are created so stage grid updates.Nivesh Rajbhandari2012-02-03
| | * | | Handle delete of multiple objects. Also, have deletion go through the mediato...Nivesh Rajbhandari2012-02-03
| | * | | Update grid and planes when elementChange event signifies the "matrix", "left...Nivesh Rajbhandari2012-02-03
| | * | | Update grid and planes when elementChange event signifies the "matrix", "left...Nivesh Rajbhandari2012-02-03
| | * | | Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
| | |\ \ \
| | | * | | Removed border special-casing from PI since the mediator now handles this gen...Nivesh Rajbhandari2012-02-01
| | | * | | Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | | * | | Updated color code to handle shapes.Nivesh Rajbhandari2012-01-31
| | | * | | Merge branch 'refs/heads/Jose-Color' into NiveshColorNivesh Rajbhandari2012-01-31
| | | |\ \ \
| | * | \ \ \ Merge branch 'refs/heads/master' into ToolFixesNivesh Rajbhandari2012-02-03
| | |\ \ \ \ \
| | * | | | | | Update PI when element is changed by one of the tools.Nivesh Rajbhandari2012-02-02
| | * | | | | | Fixing keyboard shortcut and tooltip for hand and 3d tools.Nivesh Rajbhandari2012-02-02
| * | | | | | | Merge pull request #14 from mencio/IKNINJA-854Valerio Virgillito2012-02-06
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | IKNINJA-854 - removed cons and replaced it with varValerio Virgillito2012-02-03
| |/ / / / / /
* | | | | | / Setting up library detection for Chrome File SystemJose Antonio Marquez2012-02-06
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-05
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-05
| |\ \ \ \ \ \
| * | | | | | | changes to show document dirty indicator on editing code view, and to remove ...Ananya Sen2012-02-05
* | | | | | | | Setting up Chrome IO classJose Antonio Marquez2012-02-05
| |/ / / / / / |/| | | | | |
* | | | | | | Setting up IO Ninja LibraryJose Antonio Marquez2012-02-05
* | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-04
|\| | | | | |
| * | | | | | allow to open html file in design view,Ananya Sen2012-02-03
| * | | | | | added editor tab save while switching code view tabs,Ananya Sen2012-02-03
| * | | | | | removed using montage button, since it has changed in Montafe 0.6Ananya Sen2012-02-03
| * | | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-03
| |\ \ \ \ \ \
| * | | | | | | removed usage of NJUtils.js as it is being deleted.Ananya Sen2012-02-03
| * | | | | | | integrated new file dialog with the template descriptor.json and document-con...Ananya Sen2012-02-02
* | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-04
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | updating the versions file after the montage integration. Bumped ninja versio...Valerio Virgillito2012-02-03
| | |_|_|/ / / | |/| | | | |
* | | | | | | Setting up Chrome File System API classJose Antonio Marquez2012-02-04
| |_|/ / / / |/| | | | |
* | | | | | Chrome FileSystem API TestingJose Antonio Marquez2012-02-02
* | | | | | Removing reference to Ninja UtilsJose Antonio Marquez2012-02-02
* | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| | | | |
| * | | | | Merge branch 'montage-integration' into stagingValerio Virgillito2012-02-02
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #11 from joseeight/MontageV6ColorValerio Virgillito2012-02-02
| | |\ \ \ \ \
| | | * | | | | Fixed the color popups to work with m-js v6Jose Antonio Marquez2012-02-02
| | |/ / / / /