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

	Commit message (Collapse)	Author	Age
...
\| \| \| * \| \| \| \|	Merge branch 'refs/heads/Timeline-jd' into Timeline-b2-latest	Kruti Shah	2012-02-29
\| \| \| \|\ \ \ \ \
\| * \| \| \| \| \| \| \|	Timeline: Document switching and code restructuring.	Jon Reid	2012-03-01
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-newdoc	Jon Reid	2012-02-29
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
\| * \| \| \| \| \| \| \|	Timeline: document switching + new document.	Jon Reid	2012-02-29
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #92 from mqg734/WebGLFixes	Valerio Virgillito	2012-03-02
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Selection Tool Fixes for elements flying off into space when they overlap
\| * \| \| \| \| \| \| \| \|	Fixing flying off into space bug for translate tool too.	Nivesh Rajbhandari	2012-03-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \| \|	Don't draw transform handles if the stage is the target element.	Nivesh Rajbhandari	2012-03-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \| \|	Fix for jumping issue when moving items that have any 3d on them.	Nivesh Rajbhandari	2012-03-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We can't translate 3d moves into 2d space due to perspective, so we must update the matrix3d values instead of the top-left values if items have 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \| \|	Fix for elements flying off into space when moving elements that overlap.	Nivesh Rajbhandari	2012-03-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was happening because our hit record's element and the browser's element from point did not match. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-03-01
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fixed logic error when resizing with the top-left transform handles.	Nivesh Rajbhandari	2012-03-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \| \|	Re-fixing IKNinja-940 - Can't select objects when in side/top view.	Nivesh Rajbhandari	2012-03-01
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \| \|	Last-used material (instead of FlatMaterial) is applied to shape when ↵	Nivesh Rajbhandari	2012-02-29
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	turning on use WebGL checkbox in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| \| \| \| \| * \|	Formatting fixes	Jose Antonio Marquez	2012-03-02
\| \| \| \| \| \| \| \|/
\| \| \| \| \| \| \| *	Minor logic fixes for URL resolution in CSS	Jose Antonio Marquez	2012-03-02
\| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| *	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|</