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

	Commit message (Collapse)	Author	Age
*	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>
\| *	IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into ↵	Nivesh Rajbhandari	2012-05-17
\| \| \| \| \| \| \| \| \| \| \| \|	canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	Merge branch 'refs/heads/master' into dom-architecture	Valerio Virgillito	2012-05-16
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	Add color to tag tool	Valerio Virgillito	2012-05-15
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	John Mayhew	2012-05-15
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	WorkingBranch
\| \| * \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	John Mayhew	2012-05-10
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WorkingBranch
\| \| * \| \|	put color chips in the inkbottle and fill tool	John Mayhew	2012-05-10
\| \| \| \| \|
\| \| * \| \|	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
\| \| * \| \| \|	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.
\| * \| \| \| \|	Squashed master into dom-architecture	Valerio Virgillito	2012-05-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \|	Initial Binding Hud	Armen Kesablyan	2012-05-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* \| \| \| \| \|	Merge branch 'dom-architecture' of ↵	Armen Kesablyan	2012-05-15
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:Motorola-Mobility/ninja-internal into binding
\| * \| \| \| \|	Fixing scrollbar syncing, including pan tool, for banner templates.	Nivesh Rajbhandari	2012-05-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \|	Merge branch 'refs/heads/master' into dom-architecture	Valerio Virgillito	2012-05-08
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Stage should update scroll offsets when scrolled. Note that this is not ↵	Nivesh Rajbhandari	2012-05-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	always correct because we don't get a scroll end event. Updating Pan Tool to update scroll bars. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \|	removed debugger line	Armen Kesablyan	2012-05-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* \| \| \| \| \| \|	Finished skeleton structure for binding.	Armen Kesablyan	2012-05-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* \| \| \| \| \| \|	Merge branch 'refs/heads/masterDomArc' into binding	Armen Kesablyan	2012-05-14
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-05-10
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \| \| \|	some code cleanup	Valerio Virgillito	2012-05-09
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-05-08
\| \|\\| \| \| \|
\| \| * \| \| \|	Fixed a snapping issue on the mouse down in drawing tools.	hwc487	2012-05-08
\| \| \| \| \| \|
\| \| * \| \| \|	fixes for 2D and 3D translation.	hwc487	2012-05-07
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-05-07
\| \|\\| \| \|
\| * \| \| \|	Converting geom-obj to object literal notation.	Nivesh Rajbhandari	2012-05-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \|	Converting line, circle and rectangle shapes to object literal notation.	Nivesh Rajbhandari	2012-05-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \|	created the initial environment requirements for workspace to be manipulated.	Armen Kesablyan	2012-05-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
\| * \| \| \|	Fixing references to iframe's styles in new template.	Nivesh Rajbhandari	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \|	Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture	Nivesh Rajbhandari	2012-05-04
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Refactor creating elements. Removed makeNJElement and separated the model ↵	Valerio Virgillito	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	Merge branch 'refs/heads/master' into tag-2.0	Valerio Virgillito	2012-05-03
\| \| \|\\| \|
\| \| * \| \|	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>
\| * \| \| \|	Removed special-casing for new template workflow. Instead, we will enforce ↵	Nivesh Rajbhandari	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a width and height on the body in order to do 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \|	Fixing selection and layout code to exclude SCRIPT and STYLE tags.	Nivesh Rajbhandari	2012-05-04
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \|	Support drawing in side and top view. Also, adding back support for drawing ↵	Nivesh Rajbhandari	2012-05-01
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	shapes inside canvas when double-clicked into canvas or when moused over canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* / /	Initial Setup of the binding Tool	Armen Kesablyan	2012-05-07
\|/ / \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* \|	webTemplate var gets reset to false, so must check for new stage template ↵	Nivesh Rajbhandari	2012-05-01
\| \| \| \| \| \| \| \| \| \| \| \|	differently. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \|	Merge branch 'refs/heads/ninja-internal' into StageWebTemplate	Nivesh Rajbhandari	2012-05-01
\|\ \
\| * \|	Removing some console logs	Valerio Virgillito	2012-04-30
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	Get working plane grid to draw for new stage web template workflow.	Nivesh Rajbhandari	2012-05-01
\|/ / \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* /	Squashed commit of stage architecture	Valerio Virgillito	2012-04-30
\|/ \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Merge pull request #182 from ericmueller/Canvas-interaction	Valerio Virgillito	2012-04-30
\|\ \| \| \| \|	Canvas interaction
\| *	added a console.log to show the working plane during a drag	hwc487	2012-04-27
\| \|
\| *	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-04-27
\| \|\ \| \| \| \| \| \| \| \| \|	Canvas-interaction
\| * \|	Creating shapes in a container	hwc487	2012-04-27
\| \| \|
\| * \|	canvas interaction	hwc487	2012-04-26
\| \| \|
\| * \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-04-25
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Canvas-interaction
\| * \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-04-25
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Canvas-interaction