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

	Commit message (Collapse)	Author	Age
*	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-04-11
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine.
\| *	More Absolute vs Relative changes and cleanup	Jonathan Duran	2012-04-11
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Timeline: Change Master Layer configuration menu to be on click; bug fix:	Jon Reid	2012-04-11
\|/ \| \| \| \|	Master Layer config menu does not scroll with layers. Bug fix: New layers do not take into account "show only animated layers" feature.
*	Timeline: Bug fix: Drag and Drop now working again.	Jon Reid	2012-04-10
\|
*	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-04-10
\|\
\| *	Abs. vs. Rel. animation postion functions	Jonathan Duran	2012-04-10
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| *	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-04-10
\| \|\
\| * \	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-04-10
\| \|\ \
\| \| * \	Merge pull request #159 from mqg734/WebGLMaterials	Valerio Virgillito	2012-04-09
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes.
\| \| \| * \|	Undoing bad auto-merge resize-composer.js.	Nivesh Rajbhandari	2012-04-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Undoing some minor spacing differences from auto-merge.	Nivesh Rajbhandari	2012-04-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Undoing mistakes from auto-merge.	Nivesh Rajbhandari	2012-04-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Merge branch 'refs/heads/ToolFixes' into WebGLMaterials	Nivesh Rajbhandari	2012-04-04
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| \| * \	Merge branch 'refs/heads/WebGLFileIO' into ToolFixes	Nivesh Rajbhandari	2012-04-04
\| \| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| \| \| * \	Merge branch 'refs/heads/EricSnapping' into WebGLFileIO	Nivesh Rajbhandari	2012-04-04
\| \| \| \| \| \|\ \
\| \| \| \| \| \| * \|	merge from main	hwc487	2012-03-29
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Styling PI's Materials edit button.	Nivesh Rajbhandari	2012-04-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into WebGLMaterials	Nivesh Rajbhandari	2012-03-27
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \| \|	Adding logic for flatten checkbox in PI.	Nivesh Rajbhandari	2012-03-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This requires minor modifications to both StageController and ComponentController. Also removing unused global3DSettings CSS. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \| \|	Tweaking some styles in the materials popup.	Nivesh Rajbhandari	2012-03-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \| \|	IKNINJA-758 - The rotation value of the stage is not updated in the ↵	Nivesh Rajbhandari	2012-03-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	properties panel. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \| \| \|	Timeline: New files.	Jon Reid	2012-04-10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Timeline: New Features: Tag name now present in each layer. Configuration	Jon Reid	2012-04-10
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dropdown in Master Layer; Show Only Animated Layers toggle.
* \| \| \| \| \| \| \|	Timeline: Bug fix, IKNINJA 1467, "Timeline: Changing layer names should not	Jon Reid	2012-04-09
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	require hitting "Return" key to commit the change"
* \| \| \| \| \| \|	Timeline : Deleting of layers. And master duration track updating with ↵	Kruti Shah	2012-04-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	deletion of layers Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \| \| \| \| \|	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-04-06
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-04-05
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Timeline: Improved drag-and-drop performance. Also fix problems with	Jon Reid	2012-04-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	expand/collapse getting out of synch during drag-and-drop.
\| * \| \| \| \| \| \| \|	Timeline: Bit of code cleanup in Layer.js	Jon Reid	2012-04-05
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Timeline: Bug fix: IKNINJA-1435	Jon Reid	2012-04-05
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Timeline: Bug fix for IKNINJA-1086, "CSS Style Suggestion stops working"	Jon Reid	2012-04-05
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-04-06
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| / / / / / / \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixing the number fields to not have units.	Valerio Virgillito	2012-04-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \|	Merge branch 'refs/heads/master' into components	Valerio Virgillito	2012-04-04
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	completing the component simple pi	Valerio Virgillito	2012-03-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \|	IKNINJA-1191 - Fixed the order of the components	Valerio Virgillito	2012-03-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Components now appear in alphabetical order. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \|	Merge branch 'refs/heads/master' into components	Valerio Virgillito	2012-03-28
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Cleanup of the components panel	Valerio Virgillito	2012-03-26
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renamed to naming convention. Deleted un-used file. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-04-05
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| / / / \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Merge pull request #149 from dhg637/BugFixes	Valerio Virgillito	2012-04-04
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug fixes
\| \| * \ \ \ \	Merge branch 'refs/heads/master' into BugFixes	Armen Kesablyan	2012-04-04
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Resizing Bugs	Armen Kesablyan	2012-03-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|