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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-06-20
\|\
\| *	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Valerio Virgillito	2012-06-20
\| \|\
\| * \|	remove the un-used css file	Valerio Virgillito	2012-06-20
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	fixing the last instances of the old montage components in the css panel	Valerio Virgillito	2012-06-20
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Merge branch 'refs/heads/master' into montage-v11-integration	Valerio Virgillito	2012-06-20
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	fixing the css bugs with montage v11	Valerio Virgillito	2012-06-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	fixing the components.	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>
* \| \| \| \|	Adding transparent background to color chip buttons	Jose Antonio Marquez	2012-06-20
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Add a transparent pattern to the background of color chips consumed in the app, this way you can preview colors in alpha. This was lost, just added back again. Not a big change, just minor CSS, so should only be quickly tested prior to merge.
* \| \| \|	Fixing logic to close color panel popup	Jose Antonio Marquez	2012-06-19
\| \|_\|/ \|/\| \| \| \| \| \| \| \|	This resolves closing the color panel popup when a user make a click outside the popup area or resizes the Ninja window. This should be tested prior to merging.
* \| \|	Merge pull request #298 from ericmueller/Textures	Valerio Virgillito	2012-06-19
\|\ \ \ \| \|_\|/ \|/\| \|	Textures
\| * \|	Removed Flat material from the materials library	hwc487	2012-06-15
\| \| \|
\| * \|	Re-added Raiders material	hwc487	2012-06-15
\| \| \|
\| * \|	Re-added Paris material	hwc487	2012-06-15
\| \| \|
\| * \|	Added correct 'Cancel' behavior to the material editor	hwc487	2012-06-15
\| \| \|
\| * \|	Material changes through the popup editor can effect multiple material ↵	hwc487	2012-06-15
\| \| \| \| \| \| \| \| \| \| \| \|	instances within a single object.
\| * \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-06-14
\| \|\\| \| \| \| \| \| \| \| \| \|	Textures
\| * \|	Fix for line color.	hwc487	2012-06-14
\| \| \| \| \| \| \| \| \| \| \| \|	Name change for all materials
\| * \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-06-13
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Textures
\| * \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-06-13
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Textures Conflicts: js/io/system/ninjalibrary.json
\| * \ \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-06-12
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js
\| * \| \| \| \|	Disabled the add, copy, and delete buttons in the material library panel. ↵	hwc487	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also removed the Custom Materials section.
\| * \| \| \| \|	material cleanup and rearchitecture	hwc487	2012-06-06
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-06-05
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Textures
\| * \ \ \ \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-06-04
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Textures
\| * \ \ \ \ \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-06-04
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Textures
\| * \| \| \| \| \| \| \|	Correction for texture paths.	hwc487	2012-06-01
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-05-31
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Textures Conflicts: js/io/system/ninjalibrary.json
\| * \| \| \| \| \| \| \| \|	Parameters for twistVertex material	hwc487	2012-05-25
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Editable material properties	hwc487	2012-05-22
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-05-17
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Textures
\| * \| \| \| \| \| \| \| \| \|	Exposing parameters in Water Material	hwc487	2012-05-16
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-05-11
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
\| * \| \| \| \| \| \| \| \| \| \|	Material editor	hwc487	2012-05-02
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-04-27
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Textures
\| * \| \| \| \| \| \| \| \| \| \| \|	Update materials to the new texture model.	hwc487	2012-04-26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create local world for deleted source canvases
* \| \| \| \| \| \| \| \| \| \| \| \|	Fixing binding of alpha slider/hottext in popup with panel	Jose Antonio Marquez	2012-06-18
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	More cleaning up	Jose Antonio Marquez	2012-06-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Controller will need a review and refactoring.
* \| \| \| \| \| \| \| \| \| \| \| \|	Fixed slider/hottext bindings	Jose Antonio Marquez	2012-06-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also cleaning up, however, needs much refactoring.
* \| \| \| \| \| \| \| \| \| \| \| \|	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).
* \| \| \| \| \| \| \| \| \| \| \| \|	Cleaning up references	Jose Antonio Marquez	2012-06-14
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Still need to do more cleaning up.
* \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \| \| \| \|