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

	Commit message (Collapse)	Author	Age
*	Timeline: CSS fixes.	Jon Reid	2012-06-25
\|
*	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-06-25
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both.
\| *	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-25
\| \|\
\| \| *	Merge pull request #331 from mencio/picasa-fix	Valerio Virgillito	2012-06-22
\| \| \|\ \| \| \| \| \| \| \| \|	fixing the size of the picasa images
\| \| \| *	fixing the size of the picasa images	Valerio Virgillito	2012-06-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	Merge pull request #324 from mqg734/StageGuides	Valerio Virgillito	2012-06-22
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|	Draw stage left and top references lines. Also fixed IKNinja-1720.
\| \| \| *	Display "(0, 0)" where the origin is.	Nivesh Rajbhandari	2012-06-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| *	Have to guard against cases when stage lines are parallel to the canvas and ↵	Nivesh Rajbhandari	2012-06-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the line intersection routine returns null. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| *	IKNINJA-1720 - Object in a document erases 3D grid in other document when ↵	Nivesh Rajbhandari	2012-06-21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	switching with document tabs. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| *	Draw stage left and top references lines.	Nivesh Rajbhandari	2012-06-21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	Merge pull request #327 from mencio/component-fixes	Valerio Virgillito	2012-06-22
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Fixed issue with Youtube not updating after save and Picasa background
\| \| \| * \|	Fixed issue with Youtube not updating after save and Picasa bacground	Valerio Virgillito	2012-06-21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	Timeline Fix - reopen subprop keyframes for Position and Size correctly	Jonathan Duran	2012-06-25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \|	Timeline fix - remove unneeded binding	Jonathan Duran	2012-06-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \|	Merge branch 'refs/heads/NINJAmaster' into timeline-deletekeyframefix	Jonathan Duran	2012-06-22
\| \|\\| \| \|
\| \| * \| \|	Merge pull request #320 from ananyasen/cut-copy-paste	Valerio Virgillito	2012-06-21
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \|	copy cut paste - project phase 1 check in
\| \| \| * \|	removed some redundants	Ananya Sen	2012-06-21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-21
\| \| \| \|\\|
\| \| \| * \|	- added io api to generate file from binary	Ananya Sen	2012-06-21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- refactoring and cleanup Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-20
\| \| \| \|\ \
\| \| \| * \ \	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-20
\| \| \| \|\ \ \
\| \| \| * \| \| \|	Notify for adding multiple elements together, to fix IKNINJA-1775 [Drawing a ↵	Ananya Sen	2012-06-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	different type of object after performing copy-paste on an existing object throws error on console] Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-20
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/menu/menu-entry.reel/menu-entry.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \|	adding some error handling	Ananya Sen	2012-06-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \|	parse html in memory, instead of using a doom element	Ananya Sen	2012-06-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \|	IKNINJA-1754	Ananya Sen	2012-06-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-19
\| \| \| \|\ \ \ \ \
\| \| \| * \| \| \| \| \|	start pasting in-place for cut/paste	Ananya Sen	2012-06-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \| \|	Fixed - IKNINJA-1748 - While pasting text in any text field in the PI, the ↵	Ananya Sen	2012-06-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	text gets pasted on the stage Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \| \|	Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ↵	Ananya Sen	2012-06-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is opened Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \| \|	- Eric Guzman's styles-controller fix for relatively positioned	Ananya Sen	2012-06-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \| \|	- eric gunman's fix for styles-controller - select the appropriate override ↵	Ananya Sen	2012-06-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rule to apply the override style Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-13
\| \| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	displace pasted object only if the position is absolute	Ananya Sen	2012-06-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-12
\| \| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \|	patse raw image data to stage	Ananya Sen	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \| \| \| \|	- removed extra selection change event,	Ananya Sen	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- displace element after adding it to the document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-08
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \|	- fixed multiple paste displacement	Ananya Sen	2012-06-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-07
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \|	- cleanse html for copying from outer application	Ananya Sen	2012-06-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \| \| \| \| \| \|	cut/paste for canvas objects and for multiple selected objects of mixed types	Ananya Sen	2012-06-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-04
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \|</