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

about summary refs log tree commit diff

path: root/js/document/views/base.js

	Commit message (Collapse)	Author	Age
*	BSD License	Kris Kowal	2012-07-09
\|
*	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>
\| *	Remove trailing spaces	Kris Kowal	2012-07-06
\| \|
\| *	Expand tabs	Kris Kowal	2012-07-06
\| \|
* \|	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
\| \|
* \|	Performance fix for WebGL materials playing even when the dialog/file is no ↵	Nivesh Rajbhandari	2012-06-27
\|/ \| \| \| \| \| \| \|	longer in view. Also pausing videos when switching documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
*	Renaming variable as it will now be used	Jose Antonio Marquez	2012-05-24
\| \| \| \|	This is no longer a temp fix, it might be a permanent boolean to open/close web-request API gates.
*	fixing a few document switching issues.	Valerio Virgillito	2012-05-22
\| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Preliminary IO to new DOM view	Jose Antonio Marquez	2012-05-01
\|
*	Setting up new architecture for I/O	Jose Antonio Marquez	2012-05-01
\|
*	Setting up document rework	Jose Antonio Marquez	2012-04-02