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

	Commit message (Collapse)	Author	Age
*	Merge branch 'master' into components	Valerio Virgillito	2012-02-06
\|\
\| *	Merge pull request #16 from ericguzman/TreeComponents	Valerio Virgillito	2012-02-06
\| \|\ \| \| \| \| \| \|	Tree components
\| \| *	TreeController - moving the tree controller to the components directory	Eric Guzman	2012-02-06
\| \| \|
\| \| *	Tree Components - Adding the tree components	Eric Guzman	2012-02-06
\| \| \|
\| \| *	Tree Controller - Clean out unused code	Eric Guzman	2012-02-06
\| \| \|
\| \| *	Tree Controller - Initial add	Eric Guzman	2012-02-06
\| \| \|
\| * \|	Merge pull request #15 from mqg734/ToolFixes	Valerio Virgillito	2012-02-06
\| \|\ \ \| \| \| \| \| \| \| \|	Adding, deleting and modifying elements now keep the element planes and PI in sync.
\| \| * \|	Fixing format of for loop.	Nivesh Rajbhandari	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	Merge branch 'refs/heads/ninja-internal' into ToolFixes	Nivesh Rajbhandari	2012-02-06
\| \| \|\\|
\| \| * \|	We were only updating the first custom section in the PI.	Nivesh Rajbhandari	2012-02-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	Update element planes after shapes are created so stage grid updates.	Nivesh Rajbhandari	2012-02-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	Handle delete of multiple objects. Also, have deletion go through the ↵	Nivesh Rajbhandari	2012-02-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mediator so elementDeleted event is fired for SnapManager, DrawUtils, etc. to clean up after deleted element(s). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	Update grid and planes when elementChange event signifies the "matrix", ↵	Nivesh Rajbhandari	2012-02-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	Update grid and planes when elementChange event signifies the "matrix", ↵	Nivesh Rajbhandari	2012-02-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	Merge branch 'refs/heads/NiveshColor' into ToolFixes	Nivesh Rajbhandari	2012-02-03
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Removed border special-casing from PI since the mediator now handles this ↵	Nivesh Rajbhandari	2012-02-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	generically. Updated mediator's set stroke routine to use the setColor routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Updated color code in the PI to go through element mediator.	Nivesh Rajbhandari	2012-02-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Updated color code to handle shapes.	Nivesh Rajbhandari	2012-01-31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \|	Merge branch 'refs/heads/Jose-Color' into NiveshColor	Nivesh Rajbhandari	2012-01-31
\| \| \| \|\ \
\| \| * \| \ \	Merge branch 'refs/heads/master' into ToolFixes	Nivesh Rajbhandari	2012-02-03
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Update PI when element is changed by one of the tools.	Nivesh Rajbhandari	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \| \| \|	Fixing keyboard shortcut and tooltip for hand and 3d tools.	Nivesh Rajbhandari	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \|	Merge pull request #14 from mencio/IKNINJA-854	Valerio Virgillito	2012-02-06
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	IKNINJA-854 - removed cons and replaced it with var
\| \| * \| \| \| \|	IKNINJA-854 - removed cons and replaced it with var	Valerio Virgillito	2012-02-03
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \|	Moving the data files to a separate folder for now until montage provides ↵	Valerio Virgillito	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the final files. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \|	Merge branch 'refs/heads/master' into components	Valerio Virgillito	2012-02-05
\|\\| \| \| \| \|
\| * \| \| \| \|	updating the versions file after the montage integration. Bumped ninja ↵	Valerio Virgillito	2012-02-03
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	version to 0.5.5 in preparation to a stable build. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \|	removing the appdelegate. Now using a main reel instead.	Valerio Virgillito	2012-02-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \|	removing the old v0.6 montage folder and updating the references	Valerio Virgillito	2012-02-03
\| \| \| \| \|
* \| \| \| \|	button component using json data	Valerio Virgillito	2012-02-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \|	Merge branch 'master' into components	Valerio Virgillito	2012-02-03
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: node_modules/montage/ui/bluemoon/progress.reel/progress.html node_modules/montage/ui/image2.reel/image2.html node_modules/ninja-components/effect/desaturate-effect.js node_modules/ninja-components/effect/effect.js node_modules/ninja-components/effect/invert-effect.js node_modules/ninja-components/effect/kaliedoscope-effect.js node_modules/ninja-components/effect/multiply-effect.js node_modules/ninja-components/effect/sepia-effect.js node_modules/ninja-components/flow-controller.reel/flow-controller.html node_modules/ninja-components/flow-controller.reel/flow-controller.js node_modules/ninja-components/flow-offset.js node_modules/ninja-components/hottext.reel/hottext.css node_modules/ninja-components/hottext.reel/hottext.html node_modules/ninja-components/hottext.reel/hottext.js node_modules/ninja-components/hottextunit.reel/hottextunit.css node_modules/ninja-components/hottextunit.reel/hottextunit.html node_modules/ninja-components/hottextunit.reel/hottextunit.js node_modules/ninja-components/image2.reel/image2.html node_modules/ninja-components/image2.reel/image2.js node_modules/ninja-components/image3d.reel/image3d.html node_modules/ninja-components/image3d.reel/image3d.js node_modules/ninja-components/photo-editor.reel/photo-editor.css node_modules/ninja-components/photo-editor.reel/photo-editor.html node_modules/ninja-components/photo-editor.reel/photo-editor.js node_modules/ninja-components/slider-base.js user-document-templates/montage-application-cloud/appdelegate.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	Merge branch 'montage-integration' into staging	Valerio Virgillito	2012-02-02
\| \|\ \ \ \
\| \| * \ \ \	Merge pull request #11 from joseeight/MontageV6Color	Valerio Virgillito	2012-02-02
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the color popups to work with m-js v6
\| \| \| * \| \| \|	Fixed the color popups to work with m-js v6	Jose Antonio Marquez	2012-02-02
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed the wrapper DIV, now it's more direct to create and insert the content in the popups. Changes created DOM exceptions, so it had to be modified.
\| \| * \| \| \|	upgrading to Montage v0.6	Valerio Virgillito	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \|	Revert "Adding njUtils as a component and adding it to the application object"	Valerio Virgillito	2012-02-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f07bbfaa60c3fb7c2412c5aa97b49d114d6a88ea. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \|	Fixes for montage integration	Valerio Virgillito	2012-02-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \|	Adding njUtils as a component and adding it to the application object	Valerio Virgillito	2012-02-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \|	removing references to the old components in the app delegate	Valerio Virgillito	2012-02-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \|	upgrading to Montage v0.6	Valerio Virgillito	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \|	Revert "Adding njUtils as a component and adding it to the application object"	Valerio Virgillito	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f07bbfaa60c3fb7c2412c5aa97b49d114d6a88ea. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \|	Fixes for montage integration	Valerio Virgillito	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \|	Adding njUtils as a component and adding it to the application object	Valerio Virgillito	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \|	removing references to the old components in the app delegate	Valerio Virgillito	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \|	Merge branch 'issue-codeattribution' of github.com:mencio/ninja-internal ↵	Valerio Virgillito	2012-02-02
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into staging Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Base.scss css/ninja.css Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \|	Switching to alternate dashed line function. Adding code attributions.	Valerio Virgillito	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \|