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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-05-25
\|\
\| *	Timeline: Better fix for keeping styles/tracks in synch when adding styles	Jon Reid	2012-05-25
\| \| \| \| \| \| \| \|	on document open.
\| *	Timeline: bug fix "Layer name gets doubled" (Spreadsheet)	Jon Reid	2012-05-24
\| \|
\| *	Timeline: Bug fix IKNINJA 1566: Adding a css style property makes the blow	Jon Reid	2012-05-24
\| \| \| \| \| \| \| \|	layer name disappear.
* \|	animation name string fix	Jonathan Duran	2012-05-25
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	remove console logs	Jonathan Duran	2012-05-25
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	update retrieveStoredTweens method	Jonathan Duran	2012-05-25
\|/ \| \| \| \| \|	change the method to retrieve the keyframe styles for each keyframe generically instead of hard coding for top, left, width and height Signed-off-by: Jonathan Duran <jduran@motorola.com>
*	collapse fix for restored style layers	Jonathan Duran	2012-05-24
\| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
*	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-05-24
\|\
\| *	Timeline: Easing selection per keyframe.	Jon Reid	2012-05-23
\| \|
\| *	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-05-23
\| \|\
\| * \	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-05-22
\| \|\ \
\| * \| \|	Timeline: New easing selector in spans.	Jon Reid	2012-05-22
\| \| \| \|
* \| \| \|	recreating layer props	Jonathan Duran	2012-05-24
\| \|_\|/ \|/\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \|	Diamond keyframes	Jonathan Duran	2012-05-23
\| \|/ \|/\| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	update ease method to distinguish between main animation and prop animations	Jonathan Duran	2012-05-22
\|/ \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
*	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-05-22
\|\
\| *	Timeline: Code cleanup	Jon Reid	2012-05-18
\| \|
\| *	Timeline: Bug fixes for deleting elements.	Jon Reid	2012-05-18
\| \|
\| *	Timeline: Fix element insertion to use new TimelinePanel properties and	Jon Reid	2012-05-18
\| \| \| \| \| \| \| \| \| \|	multiselect. Fix Property Panel so changing an ID there will actually change an ID on the element (broken by switch from id to data-montage-id change).
\| *	Timeline: More bug fixes and code cleanup for multiselect.	Jon Reid	2012-05-17
\| \|
\| *	Timeline: Bug fixes for multiselect	Jon Reid	2012-05-17
\| \|
\| *	Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-local	Jon Reid	2012-05-17
\| \|\
\| * \|	Timeline: Multiselect improvements. New convenience methods. Multiselect	Jon Reid	2012-05-17
\| \| \| \| \| \| \| \| \| \| \| \|	drag and drop.
\| * \|	Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-local	Jon Reid	2012-05-16
\| \|\ \
\| * \ \	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into ↵	Jon Reid	2012-05-15
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	timeline-multiselect
\| * \| \| \|	Timeline: Multiselect from the layer panel.	Jon Reid	2012-05-15
\| \| \| \| \|
\| * \| \| \|	Merge branch 'timeline-local' into timeline-multiselect	Jon Reid	2012-05-15
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
\| \| * \| \| \|	Timeline: Code cleanup. Improve efficiency for track scrolling.	Jon Reid	2012-05-15
\| \| \| \| \| \|
\| * \| \| \| \|	Timeline: Multiselect.	Jon Reid	2012-04-27
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-05-22
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	John Mayhew	2012-05-15
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WorkingBranch
\| * \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \|	more sub prop doc open support	Jonathan Duran	2012-05-22
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \| \| \| \|	Fix restore tween for main layer track with multiple animation names	Jonathan Duran	2012-05-16
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \| \| \|	methods for setting simple ease and splitting sub prop spans	Jonathan Duran	2012-05-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \| \| \|	Remove span highlighting and start syncing pos tracks and main track keyframes	Jonathan Duran	2012-05-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \| \| \|	CSS pixel fix for prop tracks	Jonathan Duran	2012-05-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \| \| \|	remove old method	Jonathan Duran	2012-05-15
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \| \|	fix keyframe splitting	Jonathan Duran	2012-05-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \| \|	remove console logs. add retrieve tweens method for prop tracks	Jonathan Duran	2012-05-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \| \|	update stage element on sub prop keyframe select	Jonathan Duran	2012-05-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \| \|	fix bug with animation names string not reset on open doc	Jonathan Duran	2012-05-15
\| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \|	support width and height tween prop on re-opening saved doc	Jonathan Duran	2012-05-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \|	handle more prop types in subgroup keyframe rules	Jonathan Duran	2012-05-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \|	fix keyframe bug when adding keyframes to sub properties	Jonathan Duran	2012-05-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \|	handle style changes on keyframes	Jonathan Duran	2012-05-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>