ninja - [ARCHIVED 2012] An HTML5 web app content authoring tool

	Commit message (Collapse)	Author	Age
*	Merge branch 'components' of https://github.com/mencio/ninja-internal into ↵	Valerio Virgillito	2012-02-14
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integration Conflicts: js/io/document/html-document.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	Add support for drag and drop for the components.	Valerio Virgillito	2012-02-14
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-11
\|\\| \| \| \| \| \| \| \| \|	Conflicts: js/ninja.reel/ninja.html
\| *	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	John Mayhew	2012-02-10
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WorkingBranch Conflicts: js/ninja.reel/ninja.html
\| * \|	-Changed the capitalization of all main top level menus from all caps	John Mayhew	2012-02-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-Added new main-menu-controller to be the default generic handler for menu item calls that do not need to call to a specific controller -Removed the test menu item -Finalized the help submenu items and hooked them up to the main-menu-controller
* \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-10
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
\| * \|	Merge branch 'refs/heads/NINJAmaster' into Timeline	Jonathan Duran	2012-02-09
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: index.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \|	Integrate breadcrumb component and layer handling code	Jonathan Duran	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \|	merge new timeline	Jonathan Duran	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \|	File Open	Jose Antonio Marquez	2012-02-10
\| \| \| \| \| \| \| \| \| \| \| \|	Adding the functionality to open a basic file.
* \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-09
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Conflicts: index.html
\| * \|	fixed error with initializing and accessing the ninja version object from ↵	John Mayhew	2012-02-09
\| \|/ \| \| \| \| \| \|	the main reel
* \|	changes to show document dirty indicator on editing code view, and to remove ↵	Ananya Sen	2012-02-05
\| \| \| \| \| \| \| \| \| \| \| \|	dirty indicator on save. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \|	added editor tab save while switching code view tabs,	Ananya Sen	2012-02-03
\| \| \| \| \| \| \| \| \| \| \| \|	integrated new file dialog with io mediator to open the new file in a new tab Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \|	Removing reference to Ninja Utils	Jose Antonio Marquez	2012-02-02
\| \| \| \| \| \| \| \|	This was removed, will need to check was it affects. Also added the removed checking script on Ninja didDraw to prompt user for cloud simulator.
* \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-02
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore js/ninja.reel/ninja.js
\| *	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>
\| *	Adding the version to the main Ninja reel component.	Valerio Virgillito	2012-01-30
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
\| *	Adding a version json object to Ninja	Valerio Virgillito	2012-01-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies. Loaded before montage to use in the splash screen. Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
* \|	refactoring some file names and locations,	Ananya Sen	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \|	change made to maintain only one codemirror div. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \|	Cloud IO Prompt	Jose Antonio Marquez	2012-01-31
\| \| \| \| \| \| \| \|	Setting up UI for the file IO prompt on initialization of Ninja and whenever a cloud IO call is made and the server is not detected.
* \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-01-30
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Stage.scss
\| * \|	Adding the version to the main Ninja reel component.	Valerio Virgillito	2012-01-31
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
\| * \|	Adding a version json object to Ninja	Valerio Virgillito	2012-01-31
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies. Loaded before montage to use in the splash screen. Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
* \|	Core API clean up	Jose Antonio Marquez	2012-01-29
\| \| \| \| \| \| \| \|	Cleaning up File IO core API and setting up to use URL from welcome screen or local storage. Class will perform an automatic check for IO API to be active, otherwise prompt user.
* \|	Merged old FileIO	Jose Antonio Marquez	2012-01-27
\|/
*	First commit of Ninja to ninja-internal	Pierre Frisch	2012-01-27
	Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>