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

	Commit message (Collapse)	Author	Age
...
\| * \| \|	Merge branch 'refs/heads/master' into dom-architecture	Valerio Virgillito	2012-05-16
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	removing first draw on the component event	Valerio Virgillito	2012-05-16
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	adding a null check.	Valerio Virgillito	2012-05-16
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	adding data-montage-id to the components	Valerio Virgillito	2012-05-16
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Squashed master into dom-architecture	Valerio Virgillito	2012-05-16
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Merge branch 'dom-architecture' of ↵	Valerio Virgillito	2012-05-16
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	github.com:Motorola-Mobility/ninja-internal into dom-architecture
\| \| * \|	renaming the position and size component	Valerio Virgillito	2012-05-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	reverting a pi width change	Valerio Virgillito	2012-05-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	fixing the body pi	Valerio Virgillito	2012-05-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	Merge branch 'dom-architecture' of ↵	Valerio Virgillito	2012-05-11
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:Motorola-Mobility/ninja-internal into dom-architecture
\| \| * \| \|	fixing the timeline selecting when creating a new layer	Valerio Virgillito	2012-05-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	Removing the old checkbox components. Created a new LabelCheckbox	Valerio Virgillito	2012-05-16
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	Adding support for new templates	Jose Antonio Marquez	2012-05-11
\| \|/ / \| \| \| \| \| \| \| \| \|	This is supported for NEW and OPEN, SAVE is not supported yet by I/O. Saving works, but it will not be a banner template.
\| * \|	Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵	Valerio Virgillito	2012-05-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	=== true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Partially fixing the body pi and fixing the selection controller	Valerio Virgillito	2012-05-10
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Fixing the components double click center stage position.	Valerio Virgillito	2012-05-10
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Fixing the select and text area PI	Valerio Virgillito	2012-05-10
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	fixing the components for the new dom	Valerio Virgillito	2012-05-09
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-05-17
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	John Mayhew	2012-05-15
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	WorkingBranch
\| \| * \|	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>
\| * \|	fixed bug introduced when we removed the color toolbar. The styling of the ↵	John Mayhew	2012-05-11
\| \| \| \| \| \| \| \| \| \| \| \|	color chips in the PI was broken due to a reliance on a css class from the colortoolbar reel. The requried class was copied to the properties.css file as a temporary fix.
\| * \|	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
\| * \|	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.
* \| \|	CSS Panel - delcaration - remove auto sort	Eric Guzman	2012-05-17
\| \| \|
* \| \|	CSS Panel - declaration - sort objects when flag is set	Eric Guzman	2012-05-17
\| \| \|
* \| \|	Style sheets view - Remove duplicate property definition	Eric Guzman	2012-05-17
\| \| \|
* \| \|	CSS Panel - Clear styles section on document close	Eric Guzman	2012-05-17
\| \| \|
* \| \|	CSS Panel - comment out paste handler for now	Eric Guzman	2012-05-17
\| \| \|
* \| \|	CSS Panel - remove duplicate entry in completion map	Eric Guzman	2012-05-17
\| \| \|
* \| \|	Style Declaration - fix property name in addStyle()	Eric Guzman	2012-05-16
\| \| \|
* \| \|	CSS Panel - Style sheets dirty flag added	Eric Guzman	2012-05-16
\| \| \|
* \| \|	CSS Panel - Fix toggling style on/off.	Eric Guzman	2012-05-16
\| \| \|
* \| \|	CSS Panel - Added flag to draw method to improve perceived loading time	Eric Guzman	2012-05-16
\| \| \|
* \| \|	CSS Panel - Fix issue with adding new style and activating property field	Eric Guzman	2012-05-16
\| \| \|
* \| \|	Style Declaration - Fix update/add/addNew methods	Eric Guzman	2012-05-16
\| \| \|
* \| \|	CSSPanel - Add mutli-selection and adding classes to groups of elements	Eric Guzman	2012-05-14
\| \| \|
* \| \|	CSS Panel - Fixed removing rules and checking to see if rules apply on add.	Eric Guzman	2012-05-10
\| \| \|
* \| \|	CSS Panel - Add work-around for selection change event.	Eric Guzman	2012-05-10
\| \| \|
* \| \|	CSS Panel - Rule list - remove old update code	Eric Guzman	2012-05-10
\| \| \|
* \| \|	CSS Panel - fix issue with hover/scroll to top	Eric Guzman	2012-05-10
\| \| \|
* \| \|	CSS Panel - Fix errors from new Montage and remove logs.	Eric Guzman	2012-05-10
\| \| \|
* \| \|	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-05-10
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
\| * \|	Fixing the color popup	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>
\| * \|	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>