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

	Commit message (Collapse)	Author	Age
*	CSS Style - Add style interaction	Eric Guzman	2012-04-30
\|
*	CSS Style Rule - Add code for changing selectors and showing unapplied rules	Eric Guzman	2012-04-30
\|
*	Rule List - Scroll to bottom code	Eric Guzman	2012-04-30
\|
*	CSS Panel - add handlers for css panel actions	Eric Guzman	2012-04-26
\|
*	CSS Style Rule - Nudge sheet link a bit	Eric Guzman	2012-04-24
\|
*	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-04-23
\|\
\| *	Merge branch 'refs/heads/master' into stage-document-architecture	Valerio Virgillito	2012-04-23
\| \|\
\| * \|	Temporary fix for the PI and Stage when opening the new template.	Valerio Virgillito	2012-04-23
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	more backup fixes for the old stage	Valerio Virgillito	2012-04-20
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	reverting old template to current working status. New template work.	Valerio Virgillito	2012-04-20
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	initial stage web template	Valerio Virgillito	2012-04-18
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	CSSPanel - Add to panel container	Eric Guzman	2012-04-23
\| \| \|
* \| \|	CSSPanel - Resizer	Eric Guzman	2012-04-23
\| \| \|
* \| \|	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-04-23
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	cleanup unused code.	Valerio Virgillito	2012-04-19
\| \|/ \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	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>
\| *	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>
* \|	CSS Panel - Add styles view delegate. Add handling for adding rules to ↵	Eric Guzman	2012-04-23
\| \| \| \| \| \| \| \|	stylesheets
* \|	CSS Panel - Add editing and adding new styles in declaration and style	Eric Guzman	2012-04-23
\| \|
* \|	CSS Panel - Add stub for resizer	Eric Guzman	2012-04-23
\| \|
* \|	CSS Panel - Add drag and drop UI	Eric Guzman	2012-04-13
\| \|
* \|	CSS Style Rule - Show appropriate "sheet name" for inline style	Eric Guzman	2012-04-13
\| \|
* \|	CSS Rule List - Add inline style to supported rule types	Eric Guzman	2012-04-13
\| \|
* \|	CSS Rule List - Add inline style to rule list	Eric Guzman	2012-04-13
\| \|
* \|	CSS Style Rule - Make selector editable	Eric Guzman	2012-04-12
\| \|
* \|	CSS Style - Make draggable	Eric Guzman	2012-04-12
\| \|
* \|	CSS Style - Add disabled UI state. Added Hintable and editable UI state.	Eric Guzman	2012-04-11
\| \|
* \|	CSS Rule List - Enabled list switching on selection	Eric Guzman	2012-04-11
\| \|
* \|	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-04-09
\|\\|
\| *	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>
* \| \| \| \| \| \|	Style sheet - Style update	Eric Guzman	2012-04-09
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-04-05
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	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
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|