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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-21
\|\
\| *	Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate	Jonathan Duran	2012-06-20
\| \|\
\| * \	Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate	Jonathan Duran	2012-06-20
\| \|\ \
\| * \ \	Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate	Jonathan Duran	2012-06-20
\| \|\ \ \
\| * \ \ \	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-19
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'ninja-internal/master' into test-merge	Jon Reid	2012-06-15
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
\| * \ \ \ \ \	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-11
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-06-06
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	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 branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-05-31
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \| \| \| \| \| \| \|	Timeline: bug fix "Layer name gets doubled" (Spreadsheet)	Jon Reid	2012-05-24
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Timeline: Bug fix: Layer name gets doubled (spreadsheet)	Jon Reid	2012-05-24
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-20
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #317 from joseeight/Color	Valerio Virgillito	2012-06-20
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \|	Color
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-06-20
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fixes: IKNINJA-1448	Jose Antonio Marquez	2012-06-20
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improving logic on calculating position of the color stops in the gradient picker.
* \| \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-20
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fixing the css panel button hover	Valerio Virgillito	2012-06-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/master' into montage-v11-integration	Valerio Virgillito	2012-06-20
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \| \| \|	fixing the css bugs with montage v11	Valerio Virgillito	2012-06-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/master' into montage-v11-integration	Valerio Virgillito	2012-06-18
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	updating the components and descriptor.json to support montage v.11	Valerio Virgillito	2012-06-17
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-20
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/menu/menu-entry.reel/menu-entry.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \| \| \| \| \| \|	Merge branch 'IKNINJA-1754' of github.com:mencio/ninja-internal	Valerio Virgillito	2012-06-19
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/menu/menu-entry.reel/menu-entry.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \| \| \|	IKNINJA 1754 menu not opening on hover	Valerio Virgillito	2012-06-19
\| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \| \|	Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internal	Valerio Virgillito	2012-06-19
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Reverting last change since this is is being made in a different pull request.	Ananya Sen	2012-06-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \| \| \| \| \| \|	Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main ↵	Ananya Sen	2012-06-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	menu does not work when a main menu drop down is already displayed. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \| \| \| \| \| \|	Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ↵	Ananya Sen	2012-06-18
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is opened Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \| \| \|	IKNINJA-1754	Ananya Sen	2012-06-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-19
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Cleaning reel	Jose Antonio Marquez	2012-06-17
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Cleaning up element references	Jose Antonio Marquez	2012-06-17
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Tidying up color bar	Jose Antonio Marquez	2012-06-17
\| \|/ / / / / /
\| * \| \| \| \| \|	Fix: IKNINJA-1187	Jose Antonio Marquez	2012-06-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up and fixing masking of color wheel.
\| * \| \| \| \| \|	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-06-13
\| \|\ \ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes	Nivesh Rajbhandari	2012-06-13
\| \| \|\ \ \ <