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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/master' into binding	Armen Kesablyan	2012-06-19
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| *	first iteration of adding serializable to ninja plus other changes to run ↵	Valerio Virgillito	2012-06-06
\| \| \| \| \| \| \| \| \| \| \| \|	the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Merge branch 'refs/heads/master' into binding	Armen Kesablyan	2012-06-11
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| *	cleanup and handling the document views in the document controller for now.	Valerio Virgillito	2012-05-29
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	document bindings phase 1	Valerio Virgillito	2012-05-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Merge branch 'refs/heads/dom-architecture' into binding	Armen Kesablyan	2012-05-23
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| *	fixed the shape subtool not refreshing the icon	Valerio Virgillito	2012-05-18
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Merge branch 'refs/heads/dom-architecture' into binding	Armen Kesablyan	2012-05-17
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| *	Removed unused SubSelect Tool	John Mayhew	2012-05-08
\| \|
\| *	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	John Mayhew	2012-05-07
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
\| * \|	More implementation of moving color chips to the individual subtools.	John Mayhew	2012-05-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools
* \| \|	Merge branch 'refs/heads/dom-architecture' into binding	Armen Kesablyan	2012-05-08
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/layout/tools-properties.reel/tools-properties.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \|	converting the layout folder to use data-montage-id	Valerio Virgillito	2012-04-30
\| \|/ \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* /	Initial Setup of the binding Tool	Armen Kesablyan	2012-05-07
\|/ \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
*	Removing all "module" declarations and replaced with "prototype" in ↵	John Mayhew	2012-04-26
\| \| \| \|	preparation for montage converting to the new "prototype" format fully
*	IKNINJA-764 - The Local/Global options are not in synced with both 3D object ↵	Nivesh Rajbhandari	2012-03-27
\| \| \| \| \| \|	rotate tool and 3D object translate tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
*	Merge dhg637 DisabledState into master.	Valerio Virgillito	2012-03-12
\| \| \| \| \| \|	Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb	Armen Kesablyan	2012-03-12
\| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
*	Merge branch 'refs/heads/master' into new-tool-icons	Armen Kesablyan	2012-02-22
\|\
\| *	Merged old FileIO	Jose Antonio Marquez	2012-01-27
\| \|
* \|	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>
*	First commit of Ninja to ninja-internal	Pierre Frisch	2012-01-27
	Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>