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

	Commit message (Collapse)	Author	Age
...
\| \| \| \| \| \| \| *	Merge branch 'refs/heads/Ninja-Internal' into FileIO	Jose Antonio Marquez	2012-03-02
\| \| \| \| \| \| \| \|\ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #94 from ericguzman/PresetsPanel	Valerio Virgillito	2012-03-02
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Presets Panel - Fix single-click activation, and transition cut-off bug.
\| * \| \| \| \| \| \|	Presets Panel - Fix single-click activation, and transition cut-off bug.	Eric Guzman	2012-03-02
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use double-click as the activation event for transition presets. Also fixed the bug when applying a style preset before the transition preset, which disabled transitions after the first one.
\| \| \| \| \| \| *	Fixing CSS URL issues	Jose Antonio Marquez	2012-03-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only partially, supporting unquoted files under same root.
\| \| \| \| \| \| *	Merge branch 'refs/heads/Ninja-Internal' into FileIO	Jose Antonio Marquez	2012-03-02
\| \| \| \| \| \| \|\ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #91 from mayhewinator/WorkingBranch	mayhewinator	2012-03-01
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updated name in our manifest and incremented base build number
\| * \| \| \| \| \| \|	updated name in our manifest and incremented base build number	John Mayhew	2012-03-01
\|/ / / / / / /
\| \| \| \| \| \| *	Fixing IO RegEx	Jose Antonio Marquez	2012-03-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed parsing files to have correct URLs with RegEx, inner content of CSS files still needs to be fixed.
\| \| \| \| \| \| *	Merge branch 'refs/heads/Ninja-Internal' into FileIO	Jose Antonio Marquez	2012-03-01
\| \| \| \| \| \| \|\ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #90 from mencio/stage-fixes	Valerio Virgillito	2012-03-01
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stage fixes
\| * \ \ \ \ \ \	Merge branch 'refs/heads/master' into stage-fixes	Valerio Virgillito	2012-03-01
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Squashed commit of the workspace-bugs	Valerio Virgillito	2012-03-01
\| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \|	Merge branch 'stage-fixes' of github.com:mencio/ninja-internal into stage-fixes	Valerio Virgillito	2012-03-01
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/tools/TagTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	revert removing the webkit transform from elements.	Valerio Virgillito	2012-03-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \|	revert removing the webkit transform from elements.	Valerio Virgillito	2012-03-01
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * / / / / /	stage and elements fixes	Valerio Virgillito	2012-03-01
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Resizing the iframe container when resizing the stage - Removing 3d rules from elements when adding them - Adding a name property in the pi Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| \| *	Optimizing URL intercepting detection	Jose Antonio Marquez	2012-03-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modified the way the webRequest maps to the file.
\| \| \| \| \| *	Merge pull request #24 from ananyasen/FileIO	Jose Antonio Marquez Russo	2012-02-29
\| \|_\|_\|_\|/\| \|/\| \| \| \| \| \| \| \| \| \| \|	undo/redo per document , codemirror 2.22 update
\| \| \| \| \| *	Merge branch 'refs/heads/ninja-internal-master' into FileIO	Ananya Sen	2012-02-29
\| \| \| \| \| \|\ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/selection-controller.js js/document/html-document.js js/panels/properties/content.reel/content.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \|	Merge branch 'refs/heads/integration-candidate'	Valerio Virgillito	2012-02-29
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge pull request #88 from mqg734/ToolFixes	Valerio Virgillito	2012-02-29
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for performance issue when moving shapes.
\| \| * \| \| \| \| \|	Fix for performance issue when moving shapes. We don't need to call render ↵	Nivesh Rajbhandari	2012-02-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	except if the geometry and materials change. This is more easy to see with shapes like the brush tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \|	Merge branch 'SnapManagerFixes' of https://github.com/mqg734/ninja-internal ↵	Valerio Virgillito	2012-02-29
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into integration-candidate
\| * \ \ \ \ \ \ \	Merge branch 'integration-candidate' of ↵	Valerio Virgillito	2012-02-29
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:Motorola-Mobility/ninja-internal into integration-candidate
\| \| * \ \ \ \ \ \ \	Merge pull request #87 from joseeight/FileIO-Build-Candidate	Valerio Virgillito	2012-02-29
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes to preview caching issues
\| \| \| * \ \ \ \ \ \ \	Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate	Jose Antonio Marquez	2012-02-29
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \|	Preview Fix	Jose Antonio Marquez	2012-02-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding save all logic before preview, temporary fix.
\| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate	Jose Antonio Marquez	2012-02-29
\| \| \| \|\\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \|	Fix: Caching issue with chrome tab API	Jose Antonio Marquez	2012-02-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using window.open to test movie.
\| \| \| \| * \| \| \| \| \| \| \|	Making class level url template variable	Jose Antonio Marquez	2012-02-29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created a class level variable for the URL to be parsed out of the user files.
\| \| * \| \| \| \| \| \| \| \| \|	Merge pull request #86 from imix23ways/Timeline	Valerio Virgillito	2012-02-29
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \|	Timeline
\| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/integration-candidate' into Timeline	Jonathan Duran	2012-02-29
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \|	Squashed commit of the following:	Jonathan Duran	2012-02-29
\| \| \| \| \|_\|_\|_\|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|