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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/master' into components	Valerio Virgillito	2012-02-08
\|\
\| *	Merge pull request #24 from mencio/pi_bugs	Valerio Virgillito	2012-02-08
\| \|\ \| \| \| \| \| \|	Pi bugs
\| \| *	Correcting the PI lock for height which had a bug in the original pull request.	Valerio Virgillito	2012-02-08
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	Merge branch 'refs/heads/master' into pi_bugs	Valerio Virgillito	2012-02-08
\| \| \|\
\| \| * \|	Fix for the PI Lock button.	Valerio Virgillito	2012-02-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing the following JIRA bugs: 111 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	Updating the sass file.	Valerio Virgillito	2012-02-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	Merge pull request #27 from ericguzman/TreeComponents	Valerio Virgillito	2012-02-08
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Tree Components - css fixes
\| \| * \| \|	Tree Components - css fixes	Eric Guzman	2012-02-08
\| \|/ / /
\| * \| \|	Merge pull request #25 from mayhewinator/WorkingBranch	mayhewinator	2012-02-08
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	Adding assets required to be a packaged chrome app
\| \| * \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	John Mayhew	2012-02-08
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \|	WorkingBranch
\| * \| \|	Merge pull request #23 from joseeight/SCSS	Valerio Virgillito	2012-02-08
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	Changing _scss folder to scss
\| \| * \|	adding new scss folder	Jose Antonio Marquez	2012-02-08
\| \| \| \|
\| \| * \|	delete _scss directory	Jose Antonio Marquez	2012-02-08
\| \|/ /
\| * \|	Merge pull request #21 from mencio/pi_bugs	Valerio Virgillito	2012-02-08
\| \|\ \ \| \| \| \| \| \| \| \|	Pi bugs fixes for 964, 616, 1084
\| \| * \|	IKNINJA - 1084: Fixing the custom tag.	Valerio Virgillito	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	IKNINJA-616 - Drag and drop images fix for the PI and source	Valerio Virgillito	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel.	Valerio Virgillito	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	Merge pull request #22 from ericguzman/StylesControllerUpdates	Valerio Virgillito	2012-02-08
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Styles Controller - Added array of dirty stylesheets and event dispatch ...
\| \| * \| \|	Styles Controller - Added array of dirty stylesheets and event dispatch when ↵	Eric Guzman	2012-02-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a sheet is dirtied.
\| \| \| \| *	Added manifest.json, and image file required for being a packaged chrome ↵	John Mayhew	2012-02-08
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	application. Removed the old versions.json and updated the main page to detect if it is running as a chrome app and retrieve the version info from the chrome.app object. If the app is running hosted, the code will use an XHR to load the manifest.json and retrieve the version number from it directly.
\| * \| \|	Merge pull request #20 from mqg734/ToolFixes	Valerio Virgillito	2012-02-08
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs:
\| \| * \| \|	Added ability to toggle combobox's visibility so we can show/hide materials ↵	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	comboboxes in the tool options. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \|	id's must start with a letter, so our workaround for using uuid for RDGE ↵	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	canvas id's won't work because they often start with a number. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \|	Fixing some typos and undeclared variables in GLRectangle and ShapesController.	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \|	Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \|	Fixed PI to support WebGL materials.	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \|	Updated tools and PI to get/set materials by binding to appModel's materials ↵	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \|	Merge branch 'refs/heads/ninja-internal' into ToolFixes	Nivesh Rajbhandari	2012-02-07
\| \| \|\\| \|
\| \| * \| \|	Force layout canvas and SelectionController to update their info when a 2d ↵	Nivesh Rajbhandari	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	canvas is replaced by a 3d canvas (and vice-versa). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \|	Support toggling between 2d and 3d canvas context. This requires us to ↵	Nivesh Rajbhandari	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	create a new canvas with all the same values as the canvas being replaced and copying over all the shape data. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \|	Add enabled property for ComboBox to support enabling/disabling materials ↵	Nivesh Rajbhandari	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \|	Allow users to switch between 2d and webGL mode. Note that this doesn't ↵	Nivesh Rajbhandari	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	currently work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \|	Support use WebGL checkbox in the PI.	Nivesh Rajbhandari	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \|	updated montage v.0.6 to the latest changes.	Valerio Virgillito	2012-02-07
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	Merge pull request #19 from ericguzman/TreeComponents	Valerio Virgillito	2012-02-07
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	Tree Components - Added copyright comments
\| \| * \|	Tree Components - Added copyright comments	Eric Guzman	2012-02-07
\| \|/ /
* \| \|	Merge branch 'master' into components	Valerio Virgillito	2012-02-06
\|\\| \|
\| * \|	Merge pull request #18 from ericguzman/StylesControllerUpdates	Valerio Virgillito	2012-02-06
\| \|\ \ \| \| \| \| \| \| \| \|	Styles controller updates
\| \| * \	Merge branch 'refs/heads/master' into StylesControllerUpdates	Eric Guzman	2012-02-06
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #17 from joseeight/SnapFix	Valerio Virgillito	2012-02-06
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Attempt to fix initialization bug for snap-manager
\| \| * \| \|	Attempt to fix initialization bug for snap-manager	Jose Antonio Marquez	2012-02-06
\| \|/ / /
\| \| * \|	Attempt to fix initialization bug for snap-manager	Jose Antonio Marquez	2012-02-06
\| \| \| \|
\| \| * \|	TreeController - moving the tree controller to the components directory	Eric Guzman	2012-02-06
\| \| \| \|
\| \| * \|	Tree Components - Adding the tree components	Eric Guzman	2012-02-06
\| \| \| \|
\| \| * \|	Tree Controller - Clean out unused code	Eric Guzman	2012-02-06
\| \| \| \|
\| \| * \|	Tree Controller - Initial add	Eric Guzman	2012-02-06
\| \| \| \|
\| \| * \|	Styles Controller - Add some methods for modifying css keyframe rules	Eric Guzman	2012-02-06
\| \| \| \|
\| \| * \|	Styles Controller - Correct author attribution for specificity calculation	Eric Guzman	2012-02-06
\| \| \| \|
\| \| * \|	Styles Controller - Add code to remove cache items from history (not just ↵	Eric Guzman	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nullifying them)
\| \| * \|	Styles Controller - First stab at group styling	Eric Guzman	2012-02-06
\| \| \|/ \| \| \| \| \| \| \| \| \|	Split "createOverrideRule" into two methods --> now has createOverrideSelector. Also took first stab at creating a group style.