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

	Commit message (Collapse)	Author	Age
*	Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵	Valerio Virgillito	2012-02-14
\|\ \| \| \| \| \| \|	integration
\| *	Changed height of css panel	Armen Kesablyan	2012-02-14
\| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| *	Merge branch 'refs/heads/master' into text-tool	Armen Kesablyan	2012-02-14
\| \|\
\| \| *	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Armen Kesablyan	2012-02-14
\| \| \|\
\| * \| \|	appended function : toViewportCoordinates in stage	Armen Kesablyan	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \| \|	Merge branch 'refs/heads/master' into text-tool	Armen Kesablyan	2012-02-13
\| \|\\| \|
\| \| * \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Armen Kesablyan	2012-02-13
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: css/ninja.css js/stage/stage.reel/stage.html js/tools/TextTool.js node_modules/labs/rich-text-editor.reel/rich-text-editor.css node_modules/labs/rich-text-editor.reel/rich-text-editor.html node_modules/labs/rich-text-editor.reel/rich-text-editor.js node_modules/labs/rich-text-editor.reel/rich-text-resizer.js node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| \| * \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Armen Kesablyan	2012-02-07
\| \| \|\ \ \
\| \| * \| \| \|	Revert "Initial Text Tool Implementation"	Armen Kesablyan	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 2082fa6912eec2ffabd2081b7706e8e1b88a9711.
\| * \| \| \| \|	Fixed binding to font size dropdown	Armen Kesablyan	2012-02-13
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet ↵	Armen Kesablyan	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and numbered now bound to text tool
* \| \| \| \| \|	Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into ↵	Valerio Virgillito	2012-02-14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integration
\| * \| \| \| \| \|	Cleaning up requires	Jose Antonio Marquez	2012-02-14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'refs/heads/AnanyaFileIO' into FileIO	Jose Antonio Marquez	2012-02-13
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	save integration - minor bug fix	Ananya Sen	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \| \| \| \| \|	Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO	Ananya Sen	2012-02-13
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	integrating save functionality	Ananya Sen	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \| \| \| \| \| \|	File IO UI tweaks	Jose Antonio Marquez	2012-02-13
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Making minor tweaks to the UI for file IO, will need to make much more at a later time.
\| * \| \| \| \| \| \|	Merge branch 'refs/heads/AnanyaFileIO' into FileIO	Jose Antonio Marquez	2012-02-13
\| \|\\| \| \| \| \| \|
\| \| * \| \| \| \| \|	new file dialog - preselect default template	Ananya Sen	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \| \| \| \| \|	added logical drive selection to file picker	Ananya Sen	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \| \| \| \| \|	Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO	Ananya Sen	2012-02-13
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO	Ananya Sen	2012-02-13
\| \| \|\ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-13
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| / \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixing multiple tabs	Jose Antonio Marquez	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed broken code to allow for multiple tabs to open.
\| * \| \| \| \| \| \| \|	Merge branch 'refs/heads/AnanyaFileIO' into FileIO	Jose Antonio Marquez	2012-02-13
\| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Revert "Merge from /joseeight/ninja-internal/tree/FileIO"	Ananya Sen	2012-02-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c48eeb01bd726895dc577d8b843b2a75883eee07. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \| \| \| \| \| \|	Merge from /joseeight/ninja-internal/tree/FileIO	Ananya Sen	2012-02-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \| \| \| \| \| \|	show iframeContainer if all documents are closed	Ananya Sen	2012-02-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \| \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-13
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-13
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-13
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Save 'code' view files	Jose Antonio Marquez	2012-02-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added functionality (temp) to save files in code view.
\| * \| \| \| \| \| \| \| \| \|	File Save (with CSS styles)	Jose Antonio Marquez	2012-02-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Temp fix for saving styles in <style> of HTML document.
\| * \| \| \| \| \| \| \| \| \|	File Save (HTML only)	Jose Antonio Marquez	2012-02-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added the ability to save an HTML file from design view, need to add CSS detection and saving (of styles in <style> only). Also need to add 'Save All' for all file attached to the HTML file.
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-11
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/ninja.reel/ninja.html
\| * \| \| \| \| \| \| \| \| \|	Cleaning up open file in code view	Jose Antonio Marquez	2012-02-10
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Adding back file open for code view	Jose Antonio Marquez	2012-02-10
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \|	File Open	Jose Antonio Marquez	2012-02-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding the functionality to open a basic file.
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #6 from ananyasen/FileIO	Jose Antonio Marquez Russo	2012-02-10
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \|	Open file fixes and adding opening in code view.
\| \| * \| \| \| \| \| \| \| \| \|	hide iframeContainer if we want to open code view as the first document ↵	Ananya Sen	2012-02-10