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

	Commit message (Collapse)	Author	Age
*	Remove more unneeded requires	Jonathan Duran	2012-04-19
\| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
*	Remove unneeded require	Jonathan Duran	2012-04-19
\| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
*	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-04-19
\|\
\| *	Squashed commit of the following:	Valerio Virgillito	2012-04-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commit 2054551bfb01a0f4ca2e138b9d724835462d45cd Merge: 765c2da 616a853 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 18 13:48:21 2012 -0700 Merge branch 'refs/heads/master' into integration commit 765c2da8e1aa03550caf42b2bd5f367555ad2843 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:29:41 2012 -0700 updating the picasa carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406 Merge: d27f2df cacb4a2 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:03:50 2012 -0700 Merge branch 'refs/heads/master' into integration commit d27f2df4d846064444263d7832d213535962abe7 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 11 10:39:36 2012 -0700 integrating new picasa carousel component Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 10 14:33:00 2012 -0700 fixed the text area case issue Text area was renamed from TextArea to Textarea Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 1e83e26652266136802bc7af930379c1ecd631a6 Author: Valerio Virgillito <valerio@motorola.com> Date: Mon Apr 9 22:10:45 2012 -0700 integrating montage v0.8 into ninja. Signed-off-by: Valerio Virgillito <valerio@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Remove TODOs	Jonathan Duran	2012-04-18
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Add flag for abs/rel position	Jonathan Duran	2012-04-18
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	FIX for layer selection when adding a keyframe in unselected layer	Jonathan Duran	2012-04-18
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \|	Merge branch 'refs/heads/timeline-local' into TimelineUber	Jonathan Duran	2012-04-18
\|\ \
\| * \|	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
\| \| \|
* \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-04-18
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Merge pull request #165 from mqg734/BoundsCalculation	Valerio Virgillito	2012-04-17
\| \|\ \| \| \| \| \| \|	Drag and drop of images and components should not add 3d values by default
\| \| *	Drag and drop of images and components should not add 3d values by default.	Nivesh Rajbhandari	2012-04-16
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	collapsing the history panel by default and commenting out the undo for the ↵	Valerio Virgillito	2012-04-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	3d properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	setAttribute added to the undo/redo	Valerio Virgillito	2012-04-09
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	adding a history panel	Valerio Virgillito	2012-04-09
\| \|/ \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	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: Remove default style track.	Jon Reid	2012-04-13
\| \|
* \|	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/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.
\| \| \| * \|	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.