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

	Commit message (Collapse)	Author	Age
*	Temp Runtime WebGL Fix	Jose Antonio Marquez	2012-03-10
\| \| \| \|	Added a temporary fix to allow for webGL runtime functionality. Copying the desired folder name into a static name. There is a lag in doing this, so obviously now ideal. Need to discuss adding dynamic path-ing during author and runtime.
*	Setting local path to assets	Jose Antonio Marquez	2012-03-10
\| \| \| \|	This is still no resolving issues with webGL runtime.
*	Merge branch 'refs/heads/Ninja-Internal' into FileIO-Integration	Jose Antonio Marquez	2012-03-09
\|\
\| *	reverting old pi data	Valerio Virgillito	2012-03-09
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Merge branch 'refs/heads/Ninja-Internal' into FileIO-Integration	Jose Antonio Marquez	2012-03-09
\|\\|
\| *	Merge pull request #106 from joseeight/Color	Valerio Virgillito	2012-03-09
\| \|\ \| \| \| \| \| \|	Color Gradient Fix
\| \| *	Temp Gradient Fix	Jose Antonio Marquez	2012-03-09
\| \| \| \| \| \| \| \| \| \| \| \|	Temporary fix for getting gradient mode.
\| \| *	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-03-09
\| \| \|\ \| \| \|/ \| \|/\|
\| \| *	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-02-29
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/shapes-controller.js
\| \| * \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-28
\| \| \|\ \
\| \| * \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-23
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-22
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-21
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-17
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-17
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-16
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-15
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Bug Fixes	Jose Antonio Marquez	2012-02-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	IKNINJA-1101 IKNINJA-1079 IKNINJA-1144
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-11
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-08
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-08
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
\| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-04
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-02
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge pull request #2 from mqg734/NiveshColor	Jose Antonio Marquez Russo	2012-02-01
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated PI color code to go through mediator. Also enabled getting/setting color support for shapes.
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into Color	Jose Antonio Marquez	2012-02-01
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge pull request #1 from mqg734/NiveshColor	Jose Antonio Marquez Russo	2012-01-31
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated color code to handle shapes.
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing Issues for Windows Lib	Jose Antonio Marquez	2012-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #33 from ericmueller/integration	Jose Antonio Marquez Russo	2012-03-09
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Integration
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remap hard coded strings in rdge internal code.	hwc487	2012-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal ↵	hwc487	2012-03-09
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into integration Conflicts: js/document/html-document.js
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	further removal of authortime asset path replacement.	hwc487	2012-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing duplicate file	Jose Antonio Marquez	2012-03-09
\| \|/ / / / / / / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up	Jose Antonio Marquez	2012-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #32 from ericmueller/integration	Jose Antonio Marquez Russo	2012-03-09
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added asset folder replacement to runtime load.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed asset path replacement at authortime.	hwc487	2012-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added asset folder replacement to runtime load.	hwc487	2012-03-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding missing file for webGL, still need a fix for runtime	Jose Antonio Marquez	2012-03-09
\|/ / / / / / / / / / / / / / / / / / / /