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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-06-25
\|\
\| *	Fixing our textfield component to support binding. Fix for IKNINJA-1394	Valerio Virgillito	2012-06-22
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Color Popup Test Candidate	Jose Antonio Marquez	2012-06-25
\| \| \| \| \| \| \| \|	Preliminary check in for testing to commence on new color popup functionality.
* \|	Adding gradient mode to tools	Jose Antonio Marquez	2012-06-23
\| \| \| \| \| \| \| \|	Tools need to implement using gradients on pre-flight mode, so right now this will only set/get color but will now apply on draw until tools are made to apply color. This should be filed as individual issues per tool.
* \|	Added third gradient chip popup	Jose Antonio Marquez	2012-06-22
\| \| \| \| \| \| \| \|	Need to add support for gradient events dispatching from standalone chips. Just need to hook up relays for events besides HSV to bubble up.
* \|	Replacing temp color chip pop	Jose Antonio Marquez	2012-06-21
\|/ \| \| \|	This replaces the temporary color chip popup with a main popup used universally throughout the app. There are still outstanding issues to be addressed, this is just the initial set up before debugging issues.
*	Fixing reference issue for toolbar fill container	Jose Antonio Marquez	2012-06-21
\| \| \| \|	The wrapper container was not being referenced, caused some toggling visibility issues.
*	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	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' into Color	Jose Antonio Marquez	2012-06-20
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #317 from joseeight/Color	Valerio Virgillito	2012-06-20
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \|	Color
\| * \| \| \| \| \| \| \| \| \|	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>
* \| \| \| \| \| \| \| \| \|	Adding transparent background to color chip buttons	Jose Antonio Marquez	2012-06-20
\| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a transparent pattern to the background of color chips consumed in the app, this way you can preview colors in alpha. This was lost, just added back again. Not a big change, just minor CSS, so should only be quickly tested prior to merge.
* \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/Ninja-Internal' into Color	Jose Antonio Marquez	2012-06-20
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	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>
* \| / / / / / /	Fixes: IKNINJA-1448	Jose Antonio Marquez	2012-06-20
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improving logic on calculating position of the color stops in the gradient picker.
* \| \| \| \| \| \|	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
\| \|\ \ \ \ \ \ <