aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #3 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-08
|\
| * Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-08
| |\ | |/ |/|
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\ \
| * \ Merge pull request #25 from mayhewinator/WorkingBranchmayhewinator2012-02-08
| |\ \
| | * \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-08
| | |\ \ | | |/ / | |/| |
| | * | Added manifest.json, and image file required for being a packaged chrome appl...John Mayhew2012-02-08
* | | | Setting up packaged appJose Antonio Marquez2012-02-08
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\| | |
| * | | Merge pull request #23 from joseeight/SCSSValerio Virgillito2012-02-08
| |\ \ \
| | * | | adding new scss folderJose Antonio Marquez2012-02-08
| | * | | delete _scss directoryJose Antonio Marquez2012-02-08
| |/ / /
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\| | |
| * | | Merge pull request #21 from mencio/pi_bugsValerio Virgillito2012-02-08
| |\ \ \
| | * | | IKNINJA - 1084: Fixing the custom tag.Valerio Virgillito2012-02-07
| | * | | IKNINJA-616 - Drag and drop images fix for the PI and sourceValerio Virgillito2012-02-07
| | * | | IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel.Valerio Virgillito2012-02-07
| * | | | Merge pull request #22 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-08
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Styles Controller - Added array of dirty stylesheets and event dispatch when ...Eric Guzman2012-02-08
| * | | | Merge pull request #20 from mqg734/ToolFixesValerio Virgillito2012-02-08
| |\ \ \ \
| | * | | | Added ability to toggle combobox's visibility so we can show/hide materials c...Nivesh Rajbhandari2012-02-07
| | * | | | id's must start with a letter, so our workaround for using uuid for RDGE canv...Nivesh Rajbhandari2012-02-07
| | * | | | Fixing some typos and undeclared variables in GLRectangle and ShapesController.Nivesh Rajbhandari2012-02-07
| | * | | | Supporting switching materials in the PI. Also, moved makeFillMaterial and ma...Nivesh Rajbhandari2012-02-07
| | * | | | Fixed PI to support WebGL materials.Nivesh Rajbhandari2012-02-07
| | * | | | Updated tools and PI to get/set materials by binding to appModel's materials ...Nivesh Rajbhandari2012-02-07
| | * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-07
| | |\| | |
| | * | | | Force layout canvas and SelectionController to update their info when a 2d ca...Nivesh Rajbhandari2012-02-06
| | * | | | Support toggling between 2d and 3d canvas context. This requires us to create...Nivesh Rajbhandari2012-02-06
| | * | | | Add enabled property for ComboBox to support enabling/disabling materials dro...Nivesh Rajbhandari2012-02-06
| | * | | | Allow users to switch between 2d and webGL mode. Note that this doesn't curre...Nivesh Rajbhandari2012-02-06
| | * | | | Support use WebGL checkbox in the PI.Nivesh Rajbhandari2012-02-06
* | | | | | Fixed data type issue on copying library filesJose Antonio Marquez2012-02-08
* | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-07
|\| | | | |
| * | | | | updated montage v.0.6 to the latest changes.Valerio Virgillito2012-02-07
| | |_|/ / | |/| | |
* | | | | Mime type fixesJose Antonio Marquez2012-02-07
* | | | | Copy local library to cloudJose Antonio Marquez2012-02-07
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-07
|\| | | |
| * | | | Merge pull request #19 from ericguzman/TreeComponentsValerio Virgillito2012-02-07
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Tree Components - Added copyright commentsEric Guzman2012-02-07
| |/ / /
* | | | Adding library synced eventsJose Antonio Marquez2012-02-07
* | | | Adding mime-type detection for new fileJose Antonio Marquez2012-02-07
* | | | Adding ability to copy an entire library for NinjaJose Antonio Marquez2012-02-07
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\| | |
| * | | Merge pull request #18 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-06
| |\ \ \
| | * \ \ Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-06
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-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