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

	Commit message (Collapse)	Author	Age
*	adding a container around the breadcrumb button	Valerio Virgillito	2012-07-12
\| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Merge branch 'refs/heads/Ninja-Master' into Document	Jose Antonio Marquez	2012-07-12
\|\
\| *	Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixes	hwc487	2012-07-11
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: assets/shaders/radialBlur.frag.glsl
\| * \|	re-wrote the radial blur shader. Changed tolerances in the deformation shaders.	hwc487	2012-07-11
\| \| \|
\| * \|	Tweak to an edge case in grid drawing.	hwc487	2012-07-10
\| \| \|
\| * \|	Grid drawing changes	hwc487	2012-07-10
\| \| \|
\| * \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-07-10
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	GridFixes
\| * \| \|	Grid drawing fixes	hwc487	2012-07-10
\| \| \| \|
\| * \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-07-09
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GridFixes Conflicts: js/helper-classes/3D/StageLine.js
\| * \| \| \|	Grid drawing fixes.	hwc487	2012-07-09
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-07-09
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GridFixes
\| * \| \| \| \|	fix for grid drawing.	hwc487	2012-07-09
\| \| \| \| \| \|
\| * \| \| \| \|	fixes for grid drawing.	hwc487	2012-07-03
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-07-02
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GridFixes
\| * \ \ \ \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-06-29
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GridFixes
* \| \| \| \| \| \| \|	Improving Document Bar UI	Jose Antonio Marquez	2012-07-12
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Setting up new document bar UI to then set up switching document view modes. Improving layout of component and cleaning up. Added icons and button UI.
* \| \| \| \| \| \|	Removed the shaders that we do not have rights to.	hwc487	2012-07-10
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	fixed incorrect capitalization for DOCTYPE html	John Mayhew	2012-07-09
\| \| \| \| \| \|
* \| \| \| \| \|	cleaned up remaining copyrights for release	John Mayhew	2012-07-09
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #381 from kriskowal/normalize	Valerio Virgillito	2012-07-09
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Normalize HTML DOCTYPE
\| * \| \| \| \| \|	Normalize HTML DOCTYPE	Kris Kowal	2012-07-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces.
* \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into ↵	Ananya Sen	2012-07-09
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	codemirror-custom-theme-removal Conflicts: js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \| \| \| \|	Merge branch 'refs/heads/Ninja-Internal' into Analytics	Jose Antonio Marquez	2012-07-09
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	BSD License	Kris Kowal	2012-07-09
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| * / \| \| \| \|	Adding Google Analytics	Jose Antonio Marquez	2012-07-09
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: index.html js/ninja.reel/ninja.html
\| * \| \| \| \|	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
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	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
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	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.