ninja - [ARCHIVED 2012] An HTML5 web app content authoring tool

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-28
\|\
\| *	Merge branch 'refs/heads/integration-candidate'	Valerio Virgillito	2012-02-28
\| \|\
\| \| *	Fix for double clicking in the resizer	Valerio Virgillito	2012-02-27
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	Merge branch 'refs/heads/integration-candidate' into Timeline	Jonathan Duran	2012-02-27
\| \| \|\
\| \| \| *	Reverting the export for publish property since its only used for testing.	Valerio Virgillito	2012-02-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the enable webGL in the PI for shapes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	Timeline : Reopening Doc has layer 1 default fix	Jonathan Duran	2012-02-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \|	Timeline: RetrieveStoredTweens calling fixed	Jonathan Duran	2012-02-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \|	Merge branch 'refs/heads/integration-candidate' into Timeline	Jonathan Duran	2012-02-27
\| \| \|\\|
\| \| \| *	Merge branch 'local-storage-version' of ↵	Valerio Virgillito	2012-02-27
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/mencio/ninja-internal into integration-candidate
\| \| \| \| *	removing the old settings class and disabling panel settings until the new ↵	Valerio Virgillito	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	panels are in Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| *	clearing the old local setting and using the new version/prefix local settings.	Valerio Virgillito	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| *	prefixing the local storage and using the new local-storage object.	Valerio Virgillito	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| *	fixing the right panel disappearing when collapsed and re-enabled	Valerio Virgillito	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| *	Merge branch 'refs/heads/master' into local-storage-version	Valerio Virgillito	2012-02-24
\| \| \| \| \|\
\| \| \| \| * \	Merge branch 'refs/heads/master' into local-storage-version	Valerio Virgillito	2012-02-23
\| \| \| \| \|\ \
\| \| \| \| * \| \|	local storage integration and versioning	Valerio Virgillito	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fixed the splitters Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| * \| \| \|	Merge branch 'FileIO-Build-Candidate' of ↵	Valerio Virgillito	2012-02-27
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/joseeight/ninja-internal into integration-candidate
\| \| \| \| * \ \ \	Merge pull request #20 from joseeight/FileIO	Jose Antonio Marquez Russo	2012-02-26
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	File IO Updates
\| \| \| * \| \ \ \ \	Merge branch 'refs/heads/ninja-internal' into ToolFixes	Nivesh Rajbhandari	2012-02-24
\| \| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Moved all color updating routines to a single function.	Nivesh Rajbhandari	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \| \| \|	Distinguish between border top/right/bottom/left colors. Also, fall back to ↵	Nivesh Rajbhandari	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	snapping routine when selecting only if the active tool allows snapping. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \| \| \|	Adjusting fill and ink bottle cursors to match the tips of the icons.	Nivesh Rajbhandari	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \| \| \| \| \| \|	Timeline : Selection Fix	Jonathan Duran	2012-02-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \| \| \| \| \|	Timeline: Order of tweens and corresponding layers taken care over	Jonathan Duran	2012-02-25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \| \| \| \| \|	Timeline : Adding Tweens Properties	Jonathan Duran	2012-02-25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \| \| \| \| \|	Merge branch 'refs/heads/Timeline-local' into Timeline	Jonathan Duran	2012-02-25
\| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \|	Timeline: Add grids to property tracks. First take on clearTimeline method ↵	Jon Reid	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on TimelinePanel class.
\| \| \| * \| \| \| \| \| \| \|	Timeline: Bug fixes: Delete corresponding track when a style is deleted from ↵	Jon Reid	2012-02-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a layer, and fix serialization variable problem.
\| \| \| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'ninja-internal/master' into Timeline-local	Jon Reid	2012-02-24
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / \| \| \| \| \|/\| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local	Jon Reid	2012-02-24
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local	Jon Reid	2012-02-24
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'ninja-internal/master' into Timeline-local	Jon Reid	2012-02-23
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
\| \| \| * \| \| \| \| \| \| \| \| \|	Timeline: Add hottext fields to layers and serialize them throughout.	Jon Reid	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/NINJAmaster' into Timeline	Jonathan Duran	2012-02-25
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / / / \| \| \|/\| \| \| \| / / / / / / \| \| \| \| \|_\|_\|/ / / / / / \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	- added flag for timeline to identify new file flow	Jonathan Duran	2012-02-24
\| \| \| \|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- added switchDocument event for timeline Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/NINJAmaster' into Timeline	Jonathan Duran	2012-02-24
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / \| \| \|/\| \| / / / / / / \| \| \| \| \|/ / / / / / \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	add back layer selection	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \| \| \| \| \|	Remove unneeded selection code	Jonathan Duran	2012-02-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \| \| \| \| \|	Move element selection to click handler	Jonathan Duran	2012-02-23
\| \|