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 MaterialsUI	Nivesh Rajbhandari	2012-07-09
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	Update copyright boilerplate	Kris Kowal	2012-07-06
\| \|
* \|	Integrating Materials UI changes. Squashed commit of the following:	Nivesh Rajbhandari	2012-06-27
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commit 89ccb55130e67c4516e616ccc56d2a649a2b9160 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jun 27 14:20:01 2012 -0700 Position Materials Editor popup and change buttons' text color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 89bca82adc781f4913f8d302a49a8baa907631c5 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jun 27 12:00:51 2012 -0700 Support deleting and editing custom materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 5be5160c4786beb70e8ad4d75562adb135718c6c Merge: 1d9d9f6 2ebf3e3 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jun 27 11:11:37 2012 -0700 Merge branch 'refs/heads/ninja-internal' into WebGLMaterials Conflicts: js/data/panels-data.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 1d9d9f6e66ea7585f07ed461cebba99e71f65de0 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jun 26 22:01:22 2012 -0700 "Save as" support to duplicate material with modified settings. Also removed Add button and disabled Reset button for now. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit bf1037508dbc686f2884765344832f906cbf06d0 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jun 26 17:23:31 2012 -0700 Added UI for duplicating and deleting materials in the Materials Library. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 54930792f9c417df5f739831164aa1f96a41d67a Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jun 26 14:29:17 2012 -0700 Added preview of material in materials editor popup and fixed some styling. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
*	Disabled the add, copy, and delete buttons in the material library panel. ↵	hwc487	2012-06-12
\| \| \| \|	Also removed the Custom Materials section.
*	Removing outdated tree-controller.	Nivesh Rajbhandari	2012-05-11
\| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
*	Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵	Nivesh Rajbhandari	2012-04-30
\| \| \| \| \| \|	our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
*	Removing all "module" declarations and replaced with "prototype" in ↵	John Mayhew	2012-04-26
\| \| \| \|	preparation for montage converting to the new "prototype" format fully
*	Use new tree control in Materials panel.	Nivesh Rajbhandari	2012-03-19
\| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
*	Replacing old button component with montage button component in our UI.	Nivesh Rajbhandari	2012-03-19
\| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
*	Updated Materials Library and Materials Editor Popup to work with latest ↵	mqg734	2012-02-21
\| \| \| \| \| \| \| \|	version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error.
*	Merged old FileIO	Jose Antonio Marquez	2012-01-27
\|
*	First commit of Ninja to ninja-internal	Pierre Frisch	2012-01-27
	Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>