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

	Commit message (Collapse)	Author	Age
*	Merge cleanup	Valerio Virgillito	2012-04-27
\| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Merge branch 'refs/heads/serialization'	Valerio Virgillito	2012-04-27
\|\
\| *	Merge branch 'stage-document-architecture' of ↵	Valerio Virgillito	2012-04-26
\| \|\ \| \| \| \| \| \| \| \| \|	https://github.com/mencio/ninja-internal into serialization
\| \| *	Fixed the stage border and layout in the new template	Valerio Virgillito	2012-04-26
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	Removing all "module" declarations and replaced with "prototype" in ↵	John Mayhew	2012-04-26
\| \|/ \| \| \| \| \| \|	preparation for montage converting to the new "prototype" format fully
* \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-04-26
\|\\|
\| *	Merge branch 'refs/heads/ninja-internal' into AllFixes	Nivesh Rajbhandari	2012-04-24
\| \|\
\| * \|	Fixing translate handles to draw without zoom value. Also fixed some typos ↵	Nivesh Rajbhandari	2012-04-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-04-24
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \|	adjusting the bread crumb to work with the new template	Valerio Virgillito	2012-04-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	reverting old template to current working status. New template work.	Valerio Virgillito	2012-04-20
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	initial stage web template	Valerio Virgillito	2012-04-18
\| \|/ \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Breadcrumb Fix	Kruti Shah	2012-04-20
\| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \|	BreadCrumb Bug Fix	Kruti Shah	2012-04-19
\| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-04-10
\|\\|
\| *	Merge branch 'refs/heads/ToolFixes' into WebGLMaterials	Nivesh Rajbhandari	2012-04-04
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	IKNINJA-764 - The Local/Global options are not in synced with both 3D object ↵	Nivesh Rajbhandari	2012-03-27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rotate tool and 3D object translate tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-03-29
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #131 from ananyasen/integration-candidate	Valerio Virgillito	2012-03-28
\| \|\ \ \| \| \| \| \| \| \| \|	Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
\| \| * \|	IKNINJA-1364 : fixed css so that white spaces are not collapsed while rendering	Ananya Sen	2012-03-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \|	IKNINJA-1266 : restrict tab size for long file names and resize tabs on ↵	Ananya Sen	2012-03-22
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	window resize Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * /	Resizers updated	Armen Kesablyan	2012-03-23
\| \|/ \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* /	Timeline : Bug Fix : IKNINJA 1374	Jonathan Duran	2012-03-23
\|/ \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
*	Some code cleanup - removing unused assignments.	Valerio Virgillito	2012-03-13
\| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Merge dhg637 DisabledState into master.	Valerio Virgillito	2012-03-12
\| \| \| \| \| \|	Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb	Armen Kesablyan	2012-03-12
\| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
*	adding some margin to the bread crumb buttons	Valerio Virgillito	2012-02-28
\| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	cleanup and fixing selecting each bread crumb	Valerio Virgillito	2012-02-28
\| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	breadcrumb cleanup and moving the resized on top of the timeline panel	Valerio Virgillito	2012-02-27
\| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Adding some missing copyrights	Valerio Virgillito	2012-02-24
\| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Fixing the breadcrumb button - removing toolbutton class since it is not a ↵	Valerio Virgillito	2012-02-23
\| \| \| \| \| \|	tool button Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Merge branch 'refs/heads/master' into new-tool-icons	Armen Kesablyan	2012-02-22
\|\
\| *	Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵	Valerio Virgillito	2012-02-21
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into file-io Conflicts: js/controllers/document-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	cleanup of the breadcrumb	Valerio Virgillito	2012-02-20
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \|	fixing the dirty flag and removing sass changes	Valerio Virgillito	2012-02-21
\| \|/ \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	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
\| * \|	fixed undo/redo for each code view document, changed new file integration ↵	Ananya Sen	2012-02-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with io mediator Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \|	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>
\| * \|	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>
\| * \|	changes to open multiple code view tabs and switch between the code views, ↵	Ananya Sen	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added nj-skinned css class for the buttons in file picker, new file dialog and save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \|	Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO	Ananya Sen	2012-02-01
\| \|\ \
\| \| * \	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-01-31
\| \| \|\ \
\| \| \| * \|	Fixing the bread-crumb background	Valerio Virgillito	2012-01-31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background. Fixing by adding the background directly to the bread-crumb component. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	fixed reference to coreioapi	Ananya Sen	2012-02-01
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cleaning up opening code view tabs Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * / /	Merged old FileIO	Jose Antonio Marquez	2012-01-27
\| \|/ /
* \| \|	Tool Button Fixes	Armen Kesablyan	2012-02-16
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* \| \|	New Icons: Last set had imperfections	Armen Kesablyan	2012-02-15
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* \| \|	Tool Icons : New layout	Armen Kesablyan	2012-02-15
\| \|/ \|/\| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* \|	Integrate breadcrumb component and layer handling code	Jonathan Duran	2012-02-06
\| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>