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

about summary refs log tree commit diff

path: root/js/tools/TextTool.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
\| \|
* \|	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>
\| *	Bug: Font Name & Size not updating text tool	Armen Kesablyan	2012-07-02
\| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* \|	Update copyright boilerplate	Kris Kowal	2012-07-06
\|/
*	Text Tool Fix - Can Not Switch Document when Text Tool Initialized	Armen Kesablyan	2012-06-23
\| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
*	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Armen Kesablyan	2012-06-20
\|\
\| *	updating the components and descriptor.json to support montage v.11	Valerio Virgillito	2012-06-17
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Initial Text Tool Changes	Armen Kesablyan	2012-06-05
\|/ \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
*	Squashed master into dom-architecture	Valerio Virgillito	2012-05-16
\| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Squashed commit of Preparing for the montage undo-manager: Architecture changes	Valerio Virgillito	2012-04-04
\| \| \| \| \| \| \| \| \|	Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Text Tool - Remove inline style from user document	Eric Guzman	2012-03-27
\|
*	Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵	Valerio Virgillito	2012-02-14
\|\ \| \| \| \| \| \|	integration
\| *	Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet ↵	Armen Kesablyan	2012-02-13
\| \| \| \| \| \| \| \|	and numbered now bound to text tool
* \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-10
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
\| *	More Text Tool Updates	Armen Kesablyan	2012-02-09
\| \|
\| *	Refactored rich text editor location	Armen Kesablyan	2012-02-07
\| \|
\| *	Initial Text tool completion.	Armen Kesablyan	2012-02-07
\| \|
\| *	Initial Text Tool Implementation	Armen Kesablyan	2012-02-02
\| \| \| \| \| \| \| \|	Has rich-text-editor in place need to place with finalized version when complete
* \|	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>