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

	Commit message (Collapse)	Author	Age
...
\| \| * \| \| \| \|	moved all tag tool css back into the scss file	John Mayhew	2012-05-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added extra padding before first input control
\| \| * \| \| \| \|	-Removed id dependence of the tag tool options CSS	John Mayhew	2012-05-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-Separated the options3d CSS from the tag tool options css -Removed unused translateObjectToolContainer CSS class
\| \| * \| \| \| \|	Removed unused SubSelect Tool	John Mayhew	2012-05-08
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fixed missing quote from last merge	John Mayhew	2012-05-07
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	John Mayhew	2012-05-07
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
\| \| * \| \| \| \|	updated ninja.css from sass	John Mayhew	2012-05-07
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	more work on making subtool styling/layout consistent	John Mayhew	2012-05-07
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	More implementation of moving color chips to the individual subtools.	John Mayhew	2012-05-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools
\| \| * \| \| \| \|	First round of moving color chips into the sub tools. Shape and Pen tool now ↵	John Mayhew	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools.
* \| \| \| \| \| \|	Exposing parameters in Water Material	hwc487	2012-05-16
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	More merge problems	hwc487	2012-05-14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fixing merge issues	hwc487	2012-05-14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-05-11
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
\| * \| \| \| \| \|	Merge pull request #219 from mqg734/TreeFix	Valerio Virgillito	2012-05-11
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	Removing outdated references in tree code.
\| \| * \| \| \| \|	Removing obsolete treeList reference in preset templates.	Nivesh Rajbhandari	2012-05-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \| \| \|	Removing outdated tree-controller.	Nivesh Rajbhandari	2012-05-11
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \|	Merge pull request #215 from mqg734/WebGLFixes	Valerio Virgillito	2012-05-11
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Updated Line, Oval and Rectangle geom classes to use object literal notation. Also, updated canvas-runtime.js to use object literal notation.
\| \| * \| \| \|	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-05-10
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Valerio Virgillito	2012-05-09
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge pull request #185 from ericguzman/StylesControllerPatch	Valerio Virgillito	2012-05-09
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Styles Controller - Fix error when trying dispatch stylesheet change eve...
\| \| \| * \| \| \| \|	Styles Controller - Fix error when trying dispatch stylesheet change event	Eric Guzman	2012-05-01
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	some code cleanup	Valerio Virgillito	2012-05-09
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| /	Squashed commit of google-components into master	Valerio Virgillito	2012-05-09
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| * \| \|	Updating canvas-runtime to use object literal notation.	Nivesh Rajbhandari	2012-05-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \|	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-05-08
\| \| \| \|\ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #201 from ericmueller/Snapping	Valerio Virgillito	2012-05-08
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes for 2D and 3D translation.
\| \| * \| \| \| \|	Fixed a snapping issue on the mouse down in drawing tools.	hwc487	2012-05-08
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-05-08
\| \| \|\ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Snapping
\| * \| \| \| \| \|	Merge pull request #197 from ananyasen/code-editor-patch	Valerio Virgillito	2012-05-08
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	Patch to fix code editor issue with latest montage
\| \| * \| \| \| \|	IKNINJA-1603	Ananya Sen	2012-05-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uncaught TypeError: Cannot read property 'documentRoot' of null js/components/layout/bread-crumb.reel/bread-crumb.js:26 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \| \| \| \|	fixed javascript errors	Ananya Sen	2012-05-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \| \| \| \|	removed incorrect id selector css for code view container since its breaking it.	Ananya Sen	2012-05-07
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * / / /	fixes for 2D and 3D translation.	hwc487	2012-05-07
\| \|/ / / /
\| \| \| * \|	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-05-07
\| \| \| \|\ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	reverting to v0.8 flow component for the picasa carousel	Valerio Virgillito	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	Fixing the color popup	Valerio Virgillito	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	Fixing the tools list separators and document bar disabled state	Valerio Virgillito	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	temporary commenting a timeline bug preventing nested selection	Valerio Virgillito	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	fixing the currentContainer	Valerio Virgillito	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id	Valerio Virgillito	2012-05-03
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \ \ \	Merge branch 'refs/heads/master' into tag-2.0	Valerio Virgillito	2012-05-03
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'refs/heads/master' into tag-2.0	Valerio Virgillito	2012-05-03
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	Refactor creating elements. Removed makeNJElement and separated the model ↵	Valerio Virgillito	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|