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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/button-switch' into montage-integration	Valerio Virgillito	2012-03-20
\|\
\| *	fully removing our old button component from Ninja	Valerio Virgillito	2012-03-19
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵	Valerio Virgillito	2012-03-19
\|\ \ \| \| \| \| \| \| \| \| \|	montage-integration
\| * \|	fixing the selection for the picasa carousel	Valerio Virgillito	2012-03-19
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵	Valerio Virgillito	2012-03-19
\|\\| \| \| \| \| \| \| \| \| \| \|	montage-integration
\| * \|	Maps - Apply default width and height styles to components if specified. ↵	Nivesh Rajbhandari	2012-03-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change default location to Sunnyvale. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	fixing the selection of components. Temporary workaround for now.	Valerio Virgillito	2012-03-18
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	looping through both branches of the components tree	Valerio Virgillito	2012-03-18
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	Merge branch 'refs/heads/master' into montage-integration	Valerio Virgillito	2012-03-19
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Merge pull request #126 from ericguzman/AddAnimationsLibrary	Valerio Virgillito	2012-03-19
\| \|\ \| \| \| \| \| \|	Presets Panel - Change Tab labels, Add Un-3d preset
\| \| *	Presets Panel - Fix conflict with default transition presets	Eric Guzman	2012-03-17
\| \| \|
\| \| *	Merge branch 'refs/heads/master' into AddAnimationsLibrary	Eric Guzman	2012-03-17
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/presets/default-transition-presets.js
\| \| * \|	Presets Panel - Change Tab labels, Add Un-3d preset	Eric Guzman	2012-03-16
\| \| \| \|
\| * \| \|	Replacing old button component with montage button component in our UI.	Nivesh Rajbhandari	2012-03-19
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \|	Youtube video is droppable	François Frisch	2012-03-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	still getting errors with the carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	Integrating picasa carousel and youtube channel	François Frisch	2012-03-17
\| \| \|
* \| \|	Adding back webkit-transform styles in set3DProperties. Changing "zoom" to ↵	Valerio Virgillito	2012-03-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"zoomValue" in map component to avoid scaling the map. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	fixing the map styles and temporary disabling the 3d styles for elements.	Valerio Virgillito	2012-03-17
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	adding element creation for the map and feedreader components.	Valerio Virgillito	2012-03-17
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	Fixed snap-manager to stop snapping after first level children.	Nivesh Rajbhandari	2012-03-17
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \|	Adding components to PI	François Frisch	2012-03-17
\| \| \|
* \| \|	Deleting unecessary property	François Frisch	2012-03-17
\| \| \|
* \| \|	Getting ownerComponent bindings	François Frisch	2012-03-17
\|/ /
* \|	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
\|\ \
\| * \|	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 components drag and drop.	Valerio Virgillito	2012-03-16
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@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
\| \| \| \| \| \| \|