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

	Commit message (Collapse)	Author	Age
*	Merge from /joseeight/ninja-internal/tree/FileIO	Ananya Sen	2012-02-10
\| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
*	file open and file new integrated again	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-09
\|\
\| *	Merge pull request #26 from pushkarjoshi/pentool	Valerio Virgillito	2012-02-09
\| \|\ \| \| \| \| \| \|	Pentool
\| \| *	Merge branch 'master' into pentool	Pushkar Joshi	2012-02-08
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
\| \| * \	Merge branch 'master' into pentool	Pushkar Joshi	2012-02-07
\| \| \|\ \
\| \| * \ \	Merge branch 'master' into pentool	Pushkar Joshi	2012-02-02
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'master' into pentool	Pushkar Joshi	2012-01-31
\| \| \|\ \ \ \
\| \| * \| \| \| \|	missed a couple of pen tool property files on last checkin	Pushkar Joshi	2012-01-30
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	fixed templates descriptor, changed validation to on key up, fixed minor ui ↵	Ananya Sen	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issues Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-08
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Tree Components - css fixes	Eric Guzman	2012-02-08
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO	Ananya Sen	2012-02-08
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-08
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	Merge pull request #21 from mencio/pi_bugs	Valerio Virgillito	2012-02-08
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pi bugs fixes for 964, 616, 1084
\| \| \| * \| \| \| \|	IKNINJA - 1084: Fixing the custom tag.	Valerio Virgillito	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	Merge pull request #20 from mqg734/ToolFixes	Valerio Virgillito	2012-02-08
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|	Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs:
\| \| \| * \| \| \| \|	Added ability to toggle combobox's visibility so we can show/hide materials ↵	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	comboboxes in the tool options. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \|	Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \|	Fixed PI to support WebGL materials.	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \|	Updated tools and PI to get/set materials by binding to appModel's materials ↵	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| * \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into ToolFixes	Nivesh Rajbhandari	2012-02-07
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \|_\|_\|/ \| \| \| \| \|/\| \| \|
\| \| \| * \| \| \| \|	Add enabled property for ComboBox to support enabling/disabling materials ↵	Nivesh Rajbhandari	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-07
\| \|\\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Tree Components - Added copyright comments	Eric Guzman	2012-02-07
\| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-06
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	TreeController - moving the tree controller to the components directory	Eric Guzman	2012-02-06
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Tree Components - Adding the tree components	Eric Guzman	2012-02-06
\| \| \|/ / / /
\| * \| \| \| \|	Adding logic to copy ninja libraries	Jose Antonio Marquez	2012-02-06
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Setting up the logic to handling copying ninja required libraries into the app local file system sandbox to be used by cloud simulator.
* \| \| \| \| \|	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>
* \| \| \| \|	removed using montage button, since it has changed in Montafe 0.6	Ananya Sen	2012-02-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-02
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore js/ninja.reel/ninja.js
\| * \| \| \|	upgrading to Montage v0.6	Valerio Virgillito	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \|	Merge pull request #12 from mqg734/ToolFixes	Valerio Virgillito	2012-02-02
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Merged pan and zoom tool and 3d stage orientation fixes. Also updated PI to support shapes properties.
\| \| * \| \| \|	Updating Shapes PI to support corner radii. Also fixed PI bug where we were ↵	Nivesh Rajbhandari	2012-02-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	always updating custom section 0. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \| \|	Checkbox and Combobox change/changing events were not setting wasSetByCode ↵	Nivesh Rajbhandari	2012-01-30
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \|	Fixing the bread-crumb background	Valerio Virgillito	2012-02-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
\| * \| \| \|	Checkbox and Combobox change/changing events were not setting wasSetByCode ↵	Nivesh Rajbhandari	2012-02-01
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@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
\|\ \ \ \
\| * \| \| \|	Fixing coreIO API referencing	Jose Antonio Marquez	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>
\| \| * \|	Checkbox and Combobox change/changing events were not setting wasSetByCode ↵	Nivesh Rajbhandari	2012-02-01
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@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.
* \| \|