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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/ninja-internal-master' into bugfix-master	Ananya Sen	2012-06-26
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| *	Merge pull request #323 from dhg637/binding	Valerio Virgillito	2012-06-26
\| \|\ \| \| \| \| \| \|	Binding View - Binding Tool & Binding Panel
\| \| *	Merge branch 'refs/heads/master' into binding	Armen Kesablyan	2012-06-25
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| \| * \	Merge branch 'refs/heads/master' into binding	Armen Kesablyan	2012-06-19
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| \| * \| \|	Objects Tray - Add hiding based on workspace mode.	Eric Guzman	2012-06-15
\| \| \| \| \|
\| \| * \| \|	Changes Made to Object Listing of iFrame	Armen Kesablyan	2012-06-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| \| * \| \|	Merge branch 'refs/heads/master' into binding	Armen Kesablyan	2012-06-11
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| \| * \| \| \|	Objects Controller - Add bindable controller properties, and bindings getter	Eric Guzman	2012-05-30
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'refs/heads/dom-architecture' into binding	Armen Kesablyan	2012-05-25
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'refs/heads/dom-architecture' into binding	Armen Kesablyan	2012-05-23
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| \| * \| \| \| \| \|	Changes to binding view	Armen Kesablyan	2012-05-19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| \| * \| \| \| \| \|	Merge branch 'refs/heads/dom-architecture' into binding	Armen Kesablyan	2012-05-17
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| \| * \| \| \| \| \| \|	Objects Panel - Add Objects controller and montage/application hack to ↵	Eric Guzman	2012-05-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	expose template
\| \| * \| \| \| \| \| \|	Merge branch 'dom-architecture' of ↵	Armen Kesablyan	2012-05-15
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:Motorola-Mobility/ninja-internal into binding
\| \| * \| \| \| \| \| \| \|	Finished skeleton structure for binding.	Armen Kesablyan	2012-05-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| \| * \| \| \| \| \| \| \|	created the initial environment requirements for workspace to be manipulated.	Armen Kesablyan	2012-05-11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* \| \| \| \| \| \| \| \| \|	refactored to move bindings to template	Ananya Sen	2012-06-26
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \| \| \| /	Fix for IKNINJA-1615: Enable mouse up event on top of the user document ↵	Valerio Virgillito	2012-06-25
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	scrollbar Chrome has a bug where mouse up does not fire when the mouse is released on top of a scrollbar. To work around this issue, I temporary increase the canvas to cover the scrollbar when drawing and then shrink it back on mouse up. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \|	removed some redundants	Ananya Sen	2012-06-21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-19
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-13
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	fixed document switching issues	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \| \|	remove serializable from custom section	Valerio Virgillito	2012-06-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \| \|	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-11
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \ \ \ \ \ \ \ \	Merge branch 'refs/heads/master' into montage-v10-integration	Valerio Virgillito	2012-06-06
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \| \| \|	first iteration of adding serializable to ninja plus other changes to run ↵	Valerio Virgillito	2012-06-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-13
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/Ninja-Internal' into TempPromptUI	Jose Antonio Marquez	2012-06-12
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Adding close Ninja prompt	Jose Antonio Marquez	2012-06-11
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding a prompt to the user to ensure all data is saved prior to closing the application. This will not let me check for documents to need saving, so it must be general and will appear at all times.
* \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-12
\|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	rewrite: currentSelectedContainer -> domContainer	Valerio Virgillito	2012-06-08
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-07
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Adding saving blocking screen	Jose Antonio Marquez	2012-06-04
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is for chrome preview, also fixed other preview bug with plain files not opening in preview.
* \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste	Ananya Sen	2012-06-04
\|\\| \| \| \| \| \| \| \| \| \| \| \|