aboutsummaryrefslogtreecommitdiff
path: root/js/data
Commit message (Expand)AuthorAge
* Squashed commit of the following:Jonathan Duran2012-02-29
* Merge branch 'local-storage-version' of https://github.com/mencio/ninja-inter...Valerio Virgillito2012-02-27
|\
| * removing the old settings class and disabling panel settings until the new pa...Valerio Virgillito2012-02-24
| * Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-24
| |\
| * \ Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-23
| |\ \
| * | | local storage integration and versioningValerio Virgillito2012-02-22
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
|\ \ \ \ | | |_|/ | |/| |
| * | | Marking inkbottle as the final tool in the set.Nivesh Rajbhandari2012-02-24
| * | | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle functio...Nivesh Rajbhandari2012-02-24
| | |/ | |/|
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\| |
| * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\ \
| * \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
| |\ \ \ | | | |/ | | |/|
| * | | Get color under mouse point from image or canvas.Nivesh Rajbhandari2012-02-14
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-22
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
| |\ \ \ | | | |/ | | |/|
| * | | New Icons: Last set had imperfectionsArmen Kesablyan2012-02-15
| * | | Tool Icons : New layoutArmen Kesablyan2012-02-15
| | |/ | |/|
* | | - file picker - select file on double clickAnanya Sen2012-02-21
| |/ |/|
* | Chrome PreviewJose Antonio Marquez2012-02-17
* | Presets Panel - Move to bottom, add to menuEric Guzman2012-02-16
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\|
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into sta...Valerio Virgillito2012-02-12
| |\
| * | initial color chip for the stageValerio Virgillito2012-02-10
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-10
| |\ \
| | * | Support export/import of GLLine data.Nivesh Rajbhandari2012-02-10
| | |/
| * / -Changed the capitalization of all main top level menus from all capsJohn Mayhew2012-02-10
| |/
* | file open and file new integrated againAnanya Sen2012-02-10
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\|
| * 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
| * Add enabled property for ComboBox to support enabling/disabling materials dro...Nivesh Rajbhandari2012-02-06
| * Support use WebGL checkbox in the PI.Nivesh Rajbhandari2012-02-06
* | 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
|\ \ \ | |/ / |/| / | |/
| * We were only updating the first custom section in the PI.Nivesh Rajbhandari2012-02-03
| * Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
| |\
| | * Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| * | Fixing keyboard shortcut and tooltip for hand and 3d tools.Nivesh Rajbhandari2012-02-02
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| |
| * | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ...Nivesh Rajbhandari2012-02-02
| |/
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27