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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-03-19
\|\
\| *	Merge pull request #124 from ericguzman/AddAnimationsLibrary	Valerio Virgillito	2012-03-16
\| \|\ \| \| \| \| \| \|	Presets Panel - Adding Animations Tab
\| \| *	Presets Panel - Adding Animations Tab	Eric Guzman	2012-03-16
\| \| \|
\| * \|	Squashed commit of SnapManagerFixes	Valerio Virgillito	2012-03-16
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Valerio Virgillito	2012-03-16
\| \|\ \
\| * \| \|	fixing the components drag and drop.	Valerio Virgillito	2012-03-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \|	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-03-16
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	IKNINJA-1305 : fixed the check for stopVideos() method's existence	Ananya Sen	2012-03-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \|	Merge pull request #121 from dhg637/Something	Valerio Virgillito	2012-03-16
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Presets Panel: Added Scale Up and Down to transitions list. According to
\| \| * \|	Presets Panel: Added Scale Up and Down to transitions list. According to eric G.	Armen Kesablyan	2012-03-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \| \|	fixing the drag and drop images to the pasteboard	Valerio Virgillito	2012-03-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	Temp fix applied to all elements	Jose Antonio Marquez	2012-03-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should be moved to 'makeNJElement' to account for the element to be loaded.
\| * \| \|	Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate	Jose Antonio Marquez	2012-03-15
\| \|\ \ \
\| \| * \ \	Merge branch 'refs/heads/Ninja-Internal' into FileIO	Jose Antonio Marquez	2012-03-15
\| \| \|\ \ \
\| \| \| * \ \	Merge pull request #118 from mencio/pi-fixes	Valerio Virgillito	2012-03-15
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issues with Properties panel, focus and grid redraw
\| \| \| \| * \ \	Merge branch 'refs/heads/master' into pi-fixes	Valerio Virgillito	2012-03-15
\| \| \| \| \|\ \ \
\| \| \| \| * \| \| \|	Fixing the splitter resize canvas bug by getting the size when a document is ↵	Valerio Virgillito	2012-03-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	opened. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| * \| \| \|	adding a focus manager to handle panel bugs where blur was not getting ↵	Valerio Virgillito	2012-03-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	called when clicking on the canvas. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| * \| \| \|	Removing the name attribute from the PI. Fixing the ID and Class attribute ↵	Valerio Virgillito	2012-03-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from the PI Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| * \| \| \| \|	Timeline: remove comment.	Jonathan Duran	2012-03-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \| \|	Timeline: Fix for layer selection problems on file open and switch.	Jonathan Duran	2012-03-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \| \|	revert space	Jonathan Duran	2012-03-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-03-15
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \|/ / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/selection-controller.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/helper-classes/backup-delete/GLBrushStroke.js js/helper-classes/backup-delete/GLCircle.js js/helper-classes/backup-delete/GLGeomObj.js js/helper-classes/backup-delete/GLRectangle.js js/helper-classes/backup-delete/GLSubpath.js js/helper-classes/backup-delete/GLWorld.js js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js js/helper-classes/backup-delete/Materials/DeformMaterial.js js/helper-classes/backup-delete/Materials/FlatMaterial.js js/helper-classes/backup-delete/Materials/FlyMaterial.js js/helper-classes/backup-delete/Materials/JuliaMaterial.js js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js js/helper-classes/backup-delete/Materials/MandelMaterial.js js/helper-classes/backup-delete/Materials/PlasmaMaterial.js js/helper-classes/backup-delete/Materials/PulseMaterial.js js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js js/helper-classes/backup-delete/Materials/StarMaterial.js js/helper-classes/backup-delete/Materials/TaperMaterial.js js/helper-classes/backup-delete/Materials/TunnelMaterial.js js/helper-classes/backup-delete/Materials/TwistMaterial.js js/helper-classes/backup-delete/Materials/TwistVertMaterial.js js/helper-classes/backup-delete/Materials/UberMaterial.js js/helper-classes/backup-delete/Materials/WaterMaterial.js js/helper-classes/backup-delete/Materials/ZInvertMaterial.js js/lib/drawing/world.js js/preloader/Preloader.js js/stage/layout.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \| \|	Fix element delete causes keyframe addition fail	Jonathan Duran	2012-03-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \| \|	Optimize Tween component needsDraw calls	Jonathan Duran	2012-03-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \| \|	Squashed commit of the following:	Jonathan Duran	2012-03-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge master into timeline Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \| \| \| \|	Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate	Jose Antonio Marquez	2012-03-15
\| \|\\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Temp fix for element dimensions (SVG)	Jose Antonio Marquez	2012-03-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a temp fix to allow for a redraw of an SVG on load.
\| \| * \| \| \| \| \|	Fixing offset bug for drag-and-drop	Jose Antonio Marquez	2012-03-15
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'refs/heads/Ninja-Internal' into FileIO	Jose Antonio Marquez	2012-03-15
\| \| \|\ \ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \|/\| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-Candidate	Jose Antonio Marquez	2012-03-15
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Valerio Virgillito	2012-03-15
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	Removing the backup-delete folder and the RDGE tools directory.	Valerio Virgillito	2012-03-15
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-Candidate	Jose Antonio Marquez	2012-03-15
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Merge pull request #34 from ericmueller/integration	Jose Antonio Marquez Russo	2012-03-15
\| \| \|\ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|	Integration
\| \| \| * \| \| \|	Corrections for Uber shader IO	hwc487	2012-03-14
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Fixed BumpMetal material	hwc487	2012-03-13
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge pull request #5 from joseeight/FileIO-Integration	Eric	2012-03-13
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean-Up
\| \| \| * \| \| \| \|	Uber material changes for IO	hwc487	2012-03-12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Adding Temp drag-drop I/O support	Jose Antonio Marquez	2012-03-15
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added methods to get data from dropped file while document is opened and save as a file. Currently only supporting images and SVGs, no error handling, which will have to be done.
\| * \| \| \| \| \|