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

	Commit message (Collapse)	Author	Age
...
* \| \| \| \|	Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal	Valerio Virgillito	2012-07-09
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \|	Normalize HTML doctype	Kris Kowal	2012-07-06
\| \| \| \| \| \|
\| * \| \| \| \|	Remove byte order markers (BOM)	Kris Kowal	2012-07-06
\| \| \| \| \| \|
\| * \| \| \| \|	Remove trailing spaces	Kris Kowal	2012-07-06
\| \| \| \| \| \|
\| * \| \| \| \|	Normalize to unix line terminators	Kris Kowal	2012-07-06
\| \| \| \| \| \|
\| * \| \| \| \|	Remove trailing spaces	Kris Kowal	2012-07-06
\| \| \| \| \| \|
\| * \| \| \| \|	Expand tabs	Kris Kowal	2012-07-06
\| \|/ / / /
* \| \| \| \|	Merge branch 'GIO-TextTool' of https://github.com/dhg637/ninja-internal	Valerio Virgillito	2012-07-09
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/tools-properties/text-properties.reel/text-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \ \ \ \	Merge branch 'refs/heads/master' into GIO-TextTool	Armen Kesablyan	2012-07-03
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Armen Kesablyan	2012-07-03
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \|
\| * \| \| \| \| \|	Text Tool 2	Armen Kesablyan	2012-07-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \| \| \| \| \|	Merge branch 'refs/heads/master' into GIO-TextTool	Armen Kesablyan	2012-07-02
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Armen Kesablyan	2012-07-02
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \|
\| * \| / \| \| \|	Bug: Font Name & Size not updating text tool	Armen Kesablyan	2012-07-02
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Armen Kesablyan	2012-06-28
\| \|\ \ \ \ \
* \| \ \ \ \ \	Merge branch 'Taper' of https://github.com/ericmueller/ninja-internal	Valerio Virgillito	2012-07-09
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/lib/geom/circle.js js/lib/rdge/materials/linear-gradient-material.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \|	'V' texture map coordinate was inverted in some cases.	hwc487	2012-06-29
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper	hwc487	2012-06-29
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper	hwc487	2012-06-28
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added capability to split a mesh into multiiple parts to avoid buffer ↵	hwc487	2012-06-28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	overflow situations.
* \| \| \| \| \| \| \| \|	Merge pull request #375 from mencio/manifest	Valerio Virgillito	2012-07-09
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updating the manifest
\| * \| \| \| \| \| \| \| \|	updating the manifest	Valerio Virgillito	2012-07-09
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \| \|	Merge pull request #372 from mencio/youtube-fix	Valerio Virgillito	2012-07-09
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing the youtube hack now that we have the proper fix from montage
\| * \| \| \| \| \| \| \| \|	Removing the youtube hack now that we have the proper fix from montage	Valerio Virgillito	2012-07-03
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing the saved instance of the component when opening a file containing the youtube component. Montage made the fix where the instance is now serialized property. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \| \|	Merge pull request #371 from ananyasen/menu-bug-fix	Valerio Virgillito	2012-07-09
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up a...
\| * \| \| \| \| \| \| \| \|	fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up and ↵	Ananya Sen	2012-07-03
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not on mouse down. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \| \| \| \|	Merge pull request #368 from mqg734/CopyPasteWebGL	Valerio Virgillito	2012-07-09
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	IKNinja-1736 and IKNinja-1802 - Copy paste WebGL bugs.
\| * \| \| \| \| \| \| \| \|	IKNinja-1736 and IKNinja-1802 - Copy paste WebGL bugs.	Nivesh Rajbhandari	2012-07-02
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \| \| \|	Merge pull request #366 from joseeight/Color	Valerio Virgillito	2012-07-09
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: IKNINJA-1634
\| * \| \| \| \| \| \| \| \|	Fix: IKNINJA-1634	Jose Antonio Marquez	2012-07-02
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing reference error for gradient stops on click.
* \| \| \| \| \| \| \| \|	Merge pull request #364 from ananyasen/bugfix-master	Valerio Virgillito	2012-07-09
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed IKNINJA-1763, IKNINJA-1807 - refresh stage after loading image/svg
\| * \| \| \| \| \| \| \| \|	removing unnecessary variable	Ananya Sen	2012-06-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \| \| \| \| \| \| \|	Fixed IKNINJA-1763, IKNINJA-1807 - refresh stage after loading is done for ↵	Ananya Sen	2012-06-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	image and svg Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \| \| \| \| \|	Merge pull request #357 from ericmueller/GridFixes	Valerio Virgillito	2012-07-09
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes for incorrect line/polygon intersections.
* \ \ \ \ \ \ \ \ \ \	Merge pull request #346 from mqg734/MaterialsUI	Valerio Virgillito	2012-07-09
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \|	UI support for preview, edit, duplicate and delete of WebGL Materials.
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into MaterialsUI	Nivesh Rajbhandari	2012-07-09
\| \|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|