ninja - [ARCHIVED 2012] An HTML5 web app content authoring tool

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/Ninja-Internal' into FileIO-Integration	Jose Antonio Marquez	2012-03-09
\|\
\| *	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-03-09
\| \|\
\| * \	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-02-29
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/shapes-controller.js
\| * \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-28
\| \|\ \ \
\| * \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-23
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-22
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-21
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-17
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-15
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-11
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	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
* \| \| \| \| \| \| \| \| \| \| \|	added close file menu item	Ananya Sen	2012-03-06
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \| \| \| \| \| \|	removing repetition from the panel container and using a static list of panels.	Valerio Virgillito	2012-03-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fixing the bugs associated with the repetition of component and PI problems. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \| \| \| \|	Squashed commit of the workspace-bugs	Valerio Virgillito	2012-03-01
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \| \| \|	Merge pull request #85 from pushkarjoshi/brushtool	Valerio Virgillito	2012-02-29
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Brushtool
\| * \| \| \| \| \| \| \| \| \|	changed the registration point of the brush tool icon and	Pushkar Joshi	2012-02-29
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added a temporary check to prevent extremely long brush strokes
* \| \| \| \| \| \| \| \| \|	Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵	Valerio Virgillito	2012-02-28
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integration-candidate
\| * \| \| \| \| \| \| \| \|	Fixing tooltips and keyboard shortcuts for 3d tools.	Nivesh Rajbhandari	2012-02-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	IKNinja-1014 and IKNinja-1015. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \| \| \| \|	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/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 FileIO	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>
* \| \| \| \| \| \| \|	- 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>
* \| \| \| \| \| \|	Chrome Preview	Jose Antonio Marquez	2012-02-17