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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate	Jonathan Duran	2012-06-20
\|\
\| *	fixing the css bugs with montage v11	Valerio Virgillito	2012-06-18
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	Merge branch 'refs/heads/master' into montage-v11-integration	Valerio Virgillito	2012-06-18
\| \|\
\| * \|	updating the components and descriptor.json to support montage v.11	Valerio Virgillito	2012-06-17
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-19
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Fixing apply 'no color'	Jose Antonio Marquez	2012-06-15
\| \|/ \| \| \| \| \| \|	This should fix canvas and standard DOM elements including the root (body or template wrapper).
* \|	Merge remote-tracking branch 'ninja-internal/master' into test-merge	Jon Reid	2012-06-15
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
\| *	Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes	Nivesh Rajbhandari	2012-06-13
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| *	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-12
\| \| \|\
\| \| * \|	remove serializable from custom section	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	adding more nonexistent properties	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
\| \| * \| \|	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>
\| * \| \| \|	We need to guard against cases where some PI controls are using HottextUnit ↵	Nivesh Rajbhandari	2012-06-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	but don't actually allow uses to change those units. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \|	Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes	Nivesh Rajbhandari	2012-06-13
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Fixing typo.	Nivesh Rajbhandari	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \|	Removing unused requires from 3d PI section.	Nivesh Rajbhandari	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \|	IKNinja-1377 - Global rotation does not work if object is translated in z.	Nivesh Rajbhandari	2012-06-11
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * / \|	Fixing properties panel to support px and % for body and other elements.	Nivesh Rajbhandari	2012-06-12
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-11
\|\\| \|
\| * \|	fixing the body color chip for non banners templates	Valerio Virgillito	2012-06-07
\| \|/ \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-05
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| *	fixing selection when switching documents	Valerio Virgillito	2012-05-31
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	fixing the closing of documents	Valerio Virgillito	2012-05-30
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵	Valerio Virgillito	2012-05-30
\| \|\ \| \| \| \| \| \| \| \| \|	into document-bindings-fix
\| \| *	PI's 3d section was not binding correctly to the current document.	Nivesh Rajbhandari	2012-05-30
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	fixing the timeline current document bindings	Valerio Virgillito	2012-05-30
\| \|/ \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	Fixing the close document.	Valerio Virgillito	2012-05-30
\| \| \| \| \| \| \| \|	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/NINJAmaster' into TimelineUber	Jonathan Duran	2012-05-31
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| *	fix for the id and class controls in the pi	Valerio Virgillito	2012-05-25
\| \| \| \| \| \| \| \| \| \| \| \|	the id and class did not set values from the pi because of the removals of all id's on element. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	Cleaning up referencing to 'documentRoot' and '_document'	Jose Antonio Marquez	2012-05-24
\| \| \| \| \| \| \| \|	Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.
\| *	fixing the undefined 'color' issue	Valerio Virgillito	2012-05-22
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture	Nivesh Rajbhandari	2012-05-18
\| \|\
\| \| *	fixing the color chip for the document root	Valerio Virgillito	2012-05-18
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Fixing radio control in the PI.	Nivesh Rajbhandari	2012-05-18
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	Fixing button controls in the Properties Panel for changes in montage v.10 ↵	Nivesh Rajbhandari	2012-05-18
\| \|/ \| \| \| \| \| \| \| \| \| \|	drawing. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	enabling basic document switching	Valerio Virgillito	2012-05-18
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	Adding a disabled property to the label-checkbox.	Valerio Virgillito	2012-05-17
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@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>
\| * \|	adding a null check.	Valerio Virgillito	2012-05-16
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Merge branch 'dom-architecture' of ↵	Valerio Virgillito	2012-05-16
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	github.com:Motorola-Mobility/ninja-internal into dom-architecture
\| \| * \|	renaming the position and size component	Valerio Virgillito	2012-05-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	reverting a pi width change	Valerio Virgillito	2012-05-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	fixing the body pi	Valerio Virgillito	2012-05-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	Removing the old checkbox components. Created a new LabelCheckbox	Valerio Virgillito	2012-05-16
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Adding support for new templates	Jose Antonio Marquez	2012-05-11
\| \| \| \| \| \| \| \| \| \| \| \|	This is supported for NEW and OPEN, SAVE is not supported yet by I/O. Saving works, but it will not be a banner template.
\| * \|	Partially fixing the body pi and fixing the selection controller	Valerio Virgillito	2012-05-10
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-05-22
\|\ \ \
\| * \| \|	Timeline: Fix element insertion to use new TimelinePanel properties and	Jon Reid	2012-05-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	multiselect. Fix Property Panel so changing an ID there will actually change an ID on the element (broken by switch from id to data-montage-id change).