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

	Commit message (Collapse)	Author	Age
*	Timeline: Bug fix: changing layer name didn't save in some circumstances.	Jon Reid	2012-04-17
\|
*	Timeline: Further fixes to new document/breadcrumb interactions.	Jon Reid	2012-04-17
\|
*	Fix tweens not updating keyframe rules	Jonathan Duran	2012-04-16
\| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
*	Timeline: Bug fixes for restoring tweens on new document and breadcrumb.	Jon Reid	2012-04-13
\|
*	Timeline: Bug fix: problem with editing layers missing last letter in new	Jon Reid	2012-04-13
\| \| \| \|	value.
*	Timeline: Remove default style track.	Jon Reid	2012-04-13
\|
*	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-04-13
\|\
\| *	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-04-13
\| \|\
\| \| *	Fixing selection/tag layout drawing when canvas and image elements have borders.	Nivesh Rajbhandari	2012-04-12
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| *	Borders are not factored into offset calculations by the browser, so we have ↵	Nivesh Rajbhandari	2012-04-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to adjust for them. Also, we should set webkit-transform-style to preserve-3d if elements are rotated (until we also support flattened mode). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| *	offsets should be calculated on offsetParent instead of parentElement.	Nivesh Rajbhandari	2012-04-11
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \|	Timeline: More bug fixes for document switching.	Jon Reid	2012-04-13
\| \| \|
* \| \|	Timeline: More bug fixes.	Jon Reid	2012-04-12
\| \| \|
* \| \|	Timeline: Bug fixes: Document switching between new documents now working.	Jon Reid	2012-04-12
\|/ / \| \| \| \| \| \| \| \|	Fixed problem with MasterDuration not being set correctly on document switch.
* \|	Timeline: Fixing the animated Element	Kruti Shah	2012-04-12
\| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \|	Timeline : Replace Element Taken Care of	Kruti Shah	2012-04-12
\| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \|	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-04-12
\|\ \
\| * \	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.
\| * \| \|	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.
* \| \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-04-12
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'refs/heads/ninja-internal' into AllFixes	Nivesh Rajbhandari	2012-04-09
\| \|\ \ \
\| * \| \| \|	Single perspective fix.	Nivesh Rajbhandari	2012-04-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note that rotating multiple objects when the stage is rotated still doesn't work and flatten still doesn't work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \|	Merge branch 'refs/heads/timeline-kruti-local' into TimelineUber	Jonathan Duran	2012-04-12
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \|	Timeline:Changing function name	Kruti Shah	2012-04-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \| \| \| \|	More Absolute vs Relative changes and cleanup	Jonathan Duran	2012-04-11
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \|	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.
\| \| \| * \|	Grow/shrink Line, Oval and Rectangles when changing stroke size.	Nivesh Rajbhandari	2012-04-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Other shape types will be handled separately for now. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	-webkit-transform-style needs to be set to preserve-3d for shapes regardless ↵	Nivesh Rajbhandari	2012-04-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of whether they are 2d shapes or WebGL shapes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Fix for line tool not working because PI requests fill color for line as ↵	Nivesh Rajbhandari	2012-04-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	well and line shape doesn't have getFillColor method. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ↵	Nivesh Rajbhandari	2012-04-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cache because they can easily get out of sync with the actual colors and materials. Instead, we will always query the object for these values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Fixing 3d tool reset to redraw handles.	Nivesh Rajbhandari	2012-04-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Adding back fix in mediator to not set 3d styles unless necessary.	Nivesh Rajbhandari	2012-04-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Undoing bad auto-merge resize-composer.js.	Nivesh Rajbhandari	2012-04-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Fixing curly brackets from auto-merge.	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>
\| \| \| * \|	Removing unnecessary code element = element.	Nivesh Rajbhandari	2012-04-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Commenting out console logs.	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>
\| \| \| \| \| * \|	We should require VecUtils instead of referring to the global reference ↵	Nivesh Rajbhandari	2012-04-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	since we will eventually remove that from the window object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| \| \| * \|	Merge branch 'refs/heads/EricSnapping' into WebGLFileIO	Nivesh Rajbhandari	2012-04-04
\| \| \| \| \| \|\ \
\| \| \| \| \| \| * \|	Snapping fixes.	hwc487	2012-04-02
\| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-03-29
\| \| \| \| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Snapping
\| \| \| \| \| \| * \| \|	merge from main	hwc487	2012-03-29
\| \| \| \| \| \| \| \| \|