ninja - [ARCHIVED] A fully featured content authoring tool to deploy HTML5 web applications.

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-28
\|\
\| *	Merge branch 'local-storage-version' of ↵	Valerio Virgillito	2012-02-27
\| \|\ \| \| \| \| \| \| \| \| \|	https://github.com/mencio/ninja-internal into integration-candidate
\| \| *	removing the old settings class and disabling panel settings until the new ↵	Valerio Virgillito	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	panels are in Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	Merge branch 'refs/heads/master' into local-storage-version	Valerio Virgillito	2012-02-24
\| \| \|\
\| \| * \	Merge branch 'refs/heads/master' into local-storage-version	Valerio Virgillito	2012-02-23
\| \| \|\ \
\| \| * \| \|	local storage integration and versioning	Valerio Virgillito	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fixed the splitters Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-24
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Marking inkbottle as the final tool in the set.	Nivesh Rajbhandari	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \|	Adding back Ink Bottle tool in the tool bar so QE can test ink bottle ↵	Nivesh Rajbhandari	2012-02-24
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-23
\| \|\\| \|
\| * \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-22
\| \|\ \ \
\| * \| \| \|	- file picker - select file on double click	Ananya Sen	2012-02-21
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- check cloud availability before IO operations [open file, new file, Save, Save As]. Canceling operation if cloud was unavailable, as per team's agreement. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \|	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-23
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'refs/heads/ninja-internal' into WebGLMaterials	Nivesh Rajbhandari	2012-02-22
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'refs/heads/ninja-internal' into ToolFixes	Nivesh Rajbhandari	2012-02-20
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Get color under mouse point from image or canvas.	Nivesh Rajbhandari	2012-02-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \|	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-22
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'refs/heads/master' into new-tool-icons	Armen Kesablyan	2012-02-22
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	New Icons: Last set had imperfections	Armen Kesablyan	2012-02-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \| \|	Tool Icons : New layout	Armen Kesablyan	2012-02-15
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* \| \|	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-21
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Chrome Preview	Jose Antonio Marquez	2012-02-17
\| \| \|
* \| \|	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-17
\|\\| \|
\| * \|	Presets Panel - Move to bottom, add to menu	Eric Guzman	2012-02-16
\| \| \|
* \| \|	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-15
\|\\| \|
\| * \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-13
\| \|\\|
\| \| *	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	Valerio Virgillito	2012-02-12
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	stage-color
\| \| * \|	initial color chip for the stage	Valerio Virgillito	2012-02-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-11
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Conflicts: js/ninja.reel/ninja.html
\| * \| \|	file open and file new integrated again	Ananya Sen	2012-02-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-08
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'refs/heads/AnanyaFileIO' into FileIO	Jose Antonio Marquez	2012-02-06
\| \|\ \ \
\| \| * \| \|	integrated save for the document tabs, detect codemirror history to show ↵	Ananya Sen	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	document dirty indicator. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-06
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-02
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore js/ninja.reel/ninja.js
\| * \| \| \| \|	Merged old FileIO	Jose Antonio Marquez	2012-01-27
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-11
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	John Mayhew	2012-02-10
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WorkingBranch
\| \| * \| \| \| \|	Support export/import of GLLine data.	Nivesh Rajbhandari	2012-02-10
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * / \| \| \|	-Changed the capitalization of all main top level menus from all caps	John Mayhew	2012-02-10
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-Added new main-menu-controller to be the default generic handler for menu item calls that do not need to call to a specific controller -Removed the test menu item -Finalized the help submenu items and hooked them up to the main-menu-controller
* \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-08
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
\| * \| \| \|	Fixed PI to support WebGL materials.	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \|	Updated tools and PI to get/set materials by binding to appModel's materials ↵	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \|	Add enabled property for ComboBox to support enabling/disabling materials ↵	Nivesh Rajbhandari	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \|	Support use WebGL checkbox in the PI.	Nivesh Rajbhandari	2012-02-06
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \|	We were only updating the first custom section in the PI.	Nivesh Rajbhandari	2012-02-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \|	Merge branch 'refs/heads/NiveshColor' into ToolFixes	Nivesh Rajbhandari	2012-02-03
\| \|\ \ \ \| \|/ / / \|/\| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \|	Fixing keyboard shortcut and tooltip for hand and 3d tools.	Nivesh Rajbhandari	2012-02-02
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	Updating Shapes PI to support corner radii. Also fixed PI bug where we were ↵	Nivesh Rajbhandari	2012-02-02
\| \|/ \| \| \| \| \| \| \| \| \| \|	always updating custom section 0. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* /	Updated color code in the PI to go through element mediator.	Nivesh Rajbhandari	2012-02-01
\|/ \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>