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>
\| *	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Armen Kesablyan	2012-06-19
\| \|\
\| \| *	removing serializable to the tree and adding a few more missing properties	Valerio Virgillito	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-11
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-06
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@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>
\| * \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Armen Kesablyan	2012-06-11
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Merge pull request #272 from pushkarjoshi/pentool	Valerio Virgillito	2012-06-06
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \|	Pentool
\| \| \| * \|	Merge branch 'master' into pentool	Pushkar Joshi	2012-05-31
\| \| \| \|\\|
\| \| \| * \|	More consistent local and global mouse coords which solves a bug with the ↵	Pushkar Joshi	2012-05-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pen minus subtool not removing 1 anchor paths
\| \| \| * \|	allow changes in the pen subtool in options to be seen by the pen tool code ↵	Pushkar Joshi	2012-05-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(can now select the pen plus, pen minus subtools) AND add keyboard shortcut for brush tool
\| \| * \| \|	Fill and Ink-Bottle fixes.	Nivesh Rajbhandari	2012-06-04
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * / \|	Initial Text Tool Changes	Armen Kesablyan	2012-06-05
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@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>
\| * \|	Removed unneeded identifier.	Nivesh Rajbhandari	2012-05-17
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	Fixed border radius hot-text linking that was broken by update to montage v.10.	Nivesh Rajbhandari	2012-05-17
\| \|/ \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@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>
\| *	-added new images for the text tool options	John Mayhew	2012-05-15
\| \| \| \| \| \| \| \| \| \|	-simplified text options CSS -fixed styling to accommodate new images
\| *	updated object 3D options bar to use the new radio styles	John Mayhew	2012-05-15
\| \| \| \| \| \| \| \|	removed its use of the sprite sheet
\| *	Add color to tag tool	Valerio Virgillito	2012-05-15
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	-fixed spacing problem in the tag tool	John Mayhew	2012-05-15
\| \| \| \| \| \| \| \|	-implemented the new mode radio buttons for the pen tool
\| *	-changed tool options radio button class to match the styling of the shape ↵	John Mayhew	2012-05-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	options tool buttons -fixed bug injected in the tag tool caused by accidental removal of the value element attribute -moved color chip in the tag tool to the right of the element radio button group
\| *	-updated images for tag and zoom tool	John Mayhew	2012-05-14
\| \| \| \| \| \| \| \|	-made tag and zoom tool radio group button styles consistent and removed duplicate classes
\| *	put color chips in the inkbottle and fill tool	John Mayhew	2012-05-10
\| \|
\| *	removed unnecessary css class	John Mayhew	2012-05-10
\| \|
\| *	-moved sel tool images to proper folder	John Mayhew	2012-05-10
\| \| \| \| \| \| \| \| \| \|	-finished styling shape tool options -added new icons for shape tool
\| *	-Consolidated many redundant css classes used in the tool options bars	John Mayhew	2012-05-09
\| \|
\| *	Correct layout and styling for the shape tool and its sub tools	John Mayhew	2012-05-09
\| \|
\| *	-Put new selection tool icons in the options bar	John Mayhew	2012-05-09
\| \| \| \| \| \| \| \|	-Styled the selection tool options bar
\| *	implemented proper styling for shape, inkbottle and fill tools	John Mayhew	2012-05-08
\| \| \| \| \| \| \| \|	make all icons for fill and stroke use the proper classes/images
\| *	removed unused classes form selection properties reel	John Mayhew	2012-05-08
\| \|
\| *	moved all tag tool css back into the scss file	John Mayhew	2012-05-08
\| \| \| \| \| \| \| \|	added extra padding before first input control
\| *	-Removed id dependence of the tag tool options CSS	John Mayhew	2012-05-08
\| \| \| \| \| \| \| \| \| \|	-Separated the options3d CSS from the tag tool options css -Removed unused translateObjectToolContainer CSS class
\| *	Removed unused SubSelect Tool	John Mayhew	2012-05-08
\| \|
\| *	Fixed missing quote from last merge	John Mayhew	2012-05-07
\| \|
\| *	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 work on making subtool styling/layout consistent	John Mayhew	2012-05-07
\| \| \|
\| * \|	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
\| * \|	First round of moving color chips into the sub tools. Shape and Pen tool now ↵	John Mayhew	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \|	have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools.
* \| \|	Changes	Armen Kesablyan	2012-05-14
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* \| \|	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>
\| * \|	Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id	Valerio Virgillito	2012-05-03
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	Nesting absolute element in the Tag tool. Refactoring element creation and ↵	Valerio Virgillito	2012-05-02
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Removing unused components references	Valerio Virgillito	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Removing more id and changing the appropriate CSS for them	Valerio Virgillito	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	fixing the menu and tool properties	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
*	Merge pull request #175 from mqg734/BoundsCalculation	Valerio Virgillito	2012-04-25
\|\ \| \| \| \|	Allow users to toggle application of stroke and border settings when using the ink bottle tool. Also, fixed translate tool's handles to draw without stage's zoom.