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

about summary refs log tree commit diff

path: root/js/panels/Timeline/Layer.reel/Layer.js

	Commit message (Collapse)	Author	Age
...
* \|	Merge branch 'refs/heads/NINJAmaster' into Timeline	Jonathan Duran	2012-03-01
\|\ \ \| \|/ \|/\|
\| *	Squashed commit of the workspace-bugs	Valerio Virgillito	2012-03-01
\| \| \| \| \| \| \| \| \| \| \| \|	- Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Timeline: efficiency improvements to collapser. Document switching.	Jon Reid	2012-03-01
\| \|
* \|	Timeline: Merge. Set collapser heights.	Jon Reid	2012-03-01
\|/
*	Timeline: More work on clear timeline method.	Jon Reid	2012-02-27
\|
*	Merge remote-tracking branch 'ninja-internal/master' into Timeline-local	Jon Reid	2012-02-24
\|\
\| *	Adding some missing copyrights	Valerio Virgillito	2012-02-24
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Timeline: Add hottext fields to layers and serialize them throughout.	Jon Reid	2012-02-23
\|/
*	Timeline Reset to clean Master branch. Code scrub.	Jonathan Duran	2012-02-23
\| \| \| \| \| \|	Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com>
*	Squashed commit of the following:	Jonathan Duran	2012-02-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commit 46292bddbfbe7415c6852142dd10fd02a276722a Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:32:22 2012 -0800 Timeline: turn off console logging. commit b8de88393182bc6e819c3d6a290ade2f804236ac Merge: e651344 37b952c Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:10:06 2012 -0800 Merge branch 'Timeline-jduran' into Timeline-jreid commit e651344d5d6c2911b31a54510c65a349c4d52db2 Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:08:25 2012 -0800 Timeline: Bug fixes IKNINJA-947: Weird behavior with adding layers with an empty layer name selected IKNINJA-990: Multiple styles can be highlighted at the same time even when they are under different layers IKNINJA-1063: Styles can be added while style column is collapsed IKNINJA-970: When there is no style added yet, the arrow sign should be in a collapsed mode Signed-off-by: Jonathan Duran <jduran@motorola.com>
*	Timeline: select/deselect layers. Work on focus/blur for layers.	Jon Reid	2012-02-07
\|
*	merge new timeline	Jonathan Duran	2012-02-06
	Signed-off-by: Jonathan Duran <jduran@motorola.com>