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

	Commit message (Collapse)	Author	Age
*	Timeline: Replace currentSelectedContainer with new model.domContainer.	Jon Reid	2012-06-15
\|
*	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 pull request #305 from joseeight/Document	Valerio Virgillito	2012-06-14
\| \|\ \| \| \| \| \| \|	Adding banner template
\| \| *	Adding banner template	Jose Antonio Marquez	2012-06-14
\| \| \| \| \| \| \| \| \| \| \| \|	Added 'leader board' template to banners.
\| * \|	Merge pull request #304 from mqg734/GIO_Fixes	Valerio Virgillito	2012-06-14
\| \|\ \ \| \| \| \| \| \| \| \|	IKNinja-1710 - Boundary box is drawn offset when switching between docs. This issue is related to move object to negative space.
\| \| * \|	IKNinja-1710 - Boundary box is drawn offset when switching between docs. ↵	Nivesh Rajbhandari	2012-06-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This issue is related to move object to negative space. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \|	Merge pull request #302 from joseeight/Color	Valerio Virgillito	2012-06-14
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Color fixes
\| \| * \| \|	Fix: IKNINJA-1608	Jose Antonio Marquez	2012-06-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changing icon, seems low res and improper size, should be hi-res PNG for future reference, using negative space offset to better display.
\| \| * \| \|	Clean up	Jose Antonio Marquez	2012-06-13
\| \| \| \| \|
\| \| * \| \|	Fix: IKNINJA-1187	Jose Antonio Marquez	2012-06-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up and fixing masking of color wheel.
\| \| * \| \|	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-06-13
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	Cleaning up color wheel component	Jose Antonio Marquez	2012-06-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor code clean up and refactoring.
\| * \| \| \|	Merge pull request #301 from pushkarjoshi/brushtool	Valerio Virgillito	2012-06-14
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|	Brushtool
\| \| * \| \|	Merge branch 'master' into brushtool	Pushkar Joshi	2012-06-13
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	fix bug #1718 (trying to delete a non-existent canvas)	Pushkar Joshi	2012-06-13
\| \| \| \| \|
\| \| * \| \|	fix bug #1704 where small paths/strokes with large stroke width caused a ↵	Pushkar Joshi	2012-06-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	flip of the gradient colors
\| \| * \| \|	correct path resizing in case of stroke width other than 1	Pushkar Joshi	2012-06-13
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' into brushtool	Pushkar Joshi	2012-06-13
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	fixes bug #1623: middle transform handle causes the brush stroke to have a ↵	Pushkar Joshi	2012-06-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	zero width or height and brush stroke cannot be recovered
\| * \| \| \|	Merge pull request #300 from mqg734/IKNinja_1715	Valerio Virgillito	2012-06-13
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|	IKNinja-1715 - GIO: canvas tag is not saved after switching WebGL option On/Off in the PI for the shape object.
\| \| * \| \|	IKNinja-1715 - GIO: canvas tag is not saved after switching WebGL option ↵	Nivesh Rajbhandari	2012-06-13
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On/Off in the PI for the shape object. We need to add the 'data-ninja'node' in replaceEelement as well. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \|	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-13
\| \| \|\\| \|
\| \| * \| \|	fixed document switching issues	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-12
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \ \ \	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-12
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-12
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	hack fix for the PI section throwing errors when dom is not ready to draw	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	remove serializable from custom section	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	fix for the the components not rendering and not selecting	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	adding more missing properties to the serialization	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	Merge branch 'montage-v10-integration' of ↵	Valerio Virgillito	2012-06-12
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:Motorola-Mobility/ninja-internal into montage-v10-integration
\| \| \| * \| \| \| \| \|	montage v10 serialization updates for timeline	Jonathan Duran	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \| \| \| \|	adding more nonexistent properties	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \| \|	fixing a default property	Valerio Virgillito	2012-06-12
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	fix a typo	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	Timeline: Fix document switching under Montage v.10	Jon Reid	2012-06-12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	fixing a timeline issue	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	adding more missing properties to the timeline	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	removing the serializable from the timeline repetition and fixing the panels ↵	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	currentDocument binding Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	adding more missing properties	Valerio Virgillito	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	adding more missing properties	Valerio Virgillito	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	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
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|<