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

	Commit message (Collapse)	Author	Age
...
* \| \| \| \|	Merge branch 'refs/heads/master' into components	Valerio Virgillito	2012-02-13
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/treeview/ninja-leaf.reel/ninja-leaf.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵	Valerio Virgillito	2012-02-09
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|	feature-branch
\| \| * \| \|	More Text Tool Updates	Armen Kesablyan	2012-02-09
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	Armen Kesablyan	2012-02-07
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css
\| \| * \| \|	Refactored rich text editor location	Armen Kesablyan	2012-02-07
\| \| \| \| \|
\| \| * \| \|	Initial Text tool completion.	Armen Kesablyan	2012-02-07
\| \| \| \| \|
\| \| * \| \|	Initial Text Tool Implementation	Armen Kesablyan	2012-02-02
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Has rich-text-editor in place need to place with finalized version when complete
* \| \| \|	Setting defaults and more cleanup	Valerio Virgillito	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \|	Merge branch 'refs/heads/master' into components	Valerio Virgillito	2012-02-08
\|\\| \| \|
\| * \| \|	updated montage v.0.6 to the latest changes.	Valerio Virgillito	2012-02-07
\| \| \|/ \| \|/\| \| \| \| \| \| \|	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>
* \| \|	removing the old v0.6 montage folder and updating the references	Valerio Virgillito	2012-02-03
\| \| \|
* \| \|	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>
\| * \|	upgrading to Montage v0.6	Valerio Virgillito	2012-02-02
\| \|/ \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Temporary son for Montage button.	Valerio Virgillito	2012-02-01
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Adding a montage framework copy for the user document	Valerio Virgillito	2012-02-01
\| \| \| \| \| \| \| \| \| \| \| \|	Adding a new montage copy containing the latest version of montage to use the new native widgets Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Moved the ninja components out of the Montage folder	Valerio Virgillito	2012-01-30
\|/ \| \| \|	Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
*	First commit of Ninja to ninja-internal	Pierre Frisch	2012-01-27
	Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>