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

	Commit message (Collapse)	Author	Age
*	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into new-easing-menu	Jon Reid	2012-06-14
\|\
\| *	Fix the broken animation	Kruti Shah	2012-06-12
\| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \|	Timeline: More work on new easing menu.	Jon Reid	2012-06-13
\| \|
* \|	Timeline: New popup menu for easing choices.	Jon Reid	2012-06-12
\|/
*	Clean up	Kruti Shah	2012-06-12
\| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
*	Merge branch 'refs/heads/TimelineUberjd' into TimelineUber	Kruti Shah	2012-06-12
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| *	remove unneeded serialization	Jonathan Duran	2012-06-12
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| *	montage v10 serialization updates for timeline	Jonathan Duran	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com> Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| *	remove some console logs and simply the prop tween retrieval conditions	Jonathan Duran	2012-06-12
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| *	Squashed commit of the following:	Jonathan Duran	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commit 8e98ce012f55576ddb979969a3a1d834301af0c7 Author: Jon Reid <tjh487@motorola.com> Date: Fri Jun 8 18:08:38 2012 -0700 Timeline: New feature: Only one easing menu can be open at a time. Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| *	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-11
\| \|\
\| \| *	IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2	Valerio Virgillito	2012-06-08
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	Merge branch 'refs/heads/master' into timeline-resizer-fix	Valerio Virgillito	2012-06-08
\| \| \|\
\| \| \| *	fixing the body color chip for non banners templates	Valerio Virgillito	2012-06-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	IKNINJA-1702: Fix the timeline resized throwing a debugger error	Valerio Virgillito	2012-06-07
\| \| \|/ \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	removing all model creators.	Valerio Virgillito	2012-06-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	changes to reopen sub property functions	Jonathan Duran	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-06
\| \|\\|
\| \| *	Merge pull request #266 from mencio/element-model-fixes	Valerio Virgillito	2012-06-05
\| \| \|\ \| \| \| \| \| \| \| \|	components fix: adding a first draw event to components
\| \| \| *	components fix: adding a first draw event to components	Valerio Virgillito	2012-06-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	Fix references to documentController.activeDocument to currentDocument.model	Jonathan Duran	2012-06-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \|	Fix error when opening file with no animations	Jonathan Duran	2012-06-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \|	Timeline: Merge branch 'pull-request' into timeline-local	Jon Reid	2012-06-05
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
\| \| * \|	Timeline: Fix line endings, set to UNIX.	Jon Reid	2012-06-05
\| \| \| \|
\| \| * \|	Timeline: Fixes to timeline to handle document switching & breadcrumb	Jon Reid	2012-06-04
\| \| \|/ \| \| \| \| \| \| \| \| \|	interactions under new DOM Architecture.
\| * \|	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-06-05
\| \|\ \
\| \| * \|	Timeline: Better style selection and deselection. Automatic re-selection of	Jon Reid	2012-06-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	previously selected style when parent layer is reselected.
\| \| * \|	Timeline: Bug fixes for deleting styles and their associated tracks	Jon Reid	2012-05-31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	correctly.
\| * \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-05
\| \|\ \ \ \| \| \|/ / \| \|/\| / \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| *	Merge pull request #264 from mencio/document-bindings-fix	Valerio Virgillito	2012-06-04
\| \| \|\ \| \| \| \| \| \| \| \|	Document bindings fix - Changing the documents architecture to use bindings instead of events
\| \| \| *	fix for the css panel	Valerio Virgillito	2012-06-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| *	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	Valerio Virgillito	2012-05-31
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	document-bindings-fix
\| \| \| * \|	fixing selection when switching documents	Valerio Virgillito	2012-05-31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| * \|	fixing the closing of documents	Valerio Virgillito	2012-05-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| * \|	Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵	Valerio Virgillito	2012-05-30
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into document-bindings-fix
\| \| \| \| * \|	PI's 3d section was not binding correctly to the current document.	Nivesh Rajbhandari	2012-05-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \|	fixing the timeline current document bindings	Valerio Virgillito	2012-05-30
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| * \|	Fixing the close document.	Valerio Virgillito	2012-05-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| * \|	document bindings phase 1	Valerio Virgillito	2012-05-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \|	removing the search bar component	Valerio Virgillito	2012-06-01
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	Merge branch 'dom-architecture' of ↵	Eric Guzman	2012-05-29
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
\| \| * \|	CSS Panel - Handle focus after editing selector	Eric Guzman	2012-05-29
\| \| \| \|
\| \| * \|	CSS Panel - Find correct previously-rendered rule list after selection.	Eric Guzman	2012-05-29
\| \| \| \|
\| \| * \|	CSS Panel - Prevent Animation on New Style	Eric Guzman	2012-05-27
\| \| \| \|
* \| \| \|	Sub Props	Kruti Shah	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \| \|	Color chip in TP	Kruti Shah	2012-06-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \| \|	Sub property	Kruti Shah	2012-06-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \| \|	LC	Kruti Shah	2012-06-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \| \|	LayerControl	Kruti Shah	2012-06-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \| \|	Clean up	Kruti Shah	2012-06-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>