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

	Commit message (Collapse)	Author	Age
*	Merge branch 'Tracking' of https://github.com/joseeight/ninja	Valerio Virgillito	2012-07-18
\|\
\| *	Merge branch 'refs/heads/Ninja-Master' into Tracking	Jose Antonio Marquez	2012-07-18
\| \|\
\| * \|	Fix: Improved download UX for cloud app	Jose Antonio Marquez	2012-07-18
\| \| \| \| \| \| \| \| \| \| \| \|	Added a fix to prevent the on close dialog of Chrome from appearing when an user has to download the Ninja Cloud app. Everything should work the same, only no dialog appears when clicking on download.
* \| \|	Merge branch 'copy-paste-bugfix' of https://github.com/ananyasen/ninja	Valerio Virgillito	2012-07-18
\|\ \ \
\| * \| \|	perform clipboard operations only if selection tool is selected since other ↵	Ananya Sen	2012-07-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tools have different conflicting session state Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \|	Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix	Ananya Sen	2012-07-18
\| \|\ \ \
\| * \| \| \|	removing iframes from pasted content to prevent frame injection attack	Ananya Sen	2012-07-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \| \|	Try pasting the binary image first, since Windows Chrome places both binary ↵	Ananya Sen	2012-07-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and html for copying an image. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \| \|	Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix	Ananya Sen	2012-07-17
\| \|\ \ \ \
\| * \| \| \| \|	Fixes : resize wrapper for content, prevent duplicate pastes	Ananya Sen	2012-07-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \| \| \|	Fixed copy paste from external applications	Ananya Sen	2012-07-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \| \|	upgrading the manifest back to v0.8.0	Valerio Virgillito	2012-07-18
\| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Manifest got overridden by the last merge. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \|	Merge branch 'refs/heads/master' into v0.7.1	Valerio Virgillito	2012-07-18
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Update Readme.md to add info on Local Cloud settings to support installing ↵	San Khong	2012-07-18
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	multiple builds of Ninja.
* \| \| \|	fixing the copyrights on the timeline branch pull request.	Valerio Virgillito	2012-07-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \|	Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja into v0.7.1	Valerio Virgillito	2012-07-18
\|\ \ \ \
\| * \| \| \|	Merge branch 'refs/heads/NINJA-master' into TimelineUber	Jonathan Duran	2012-07-18
\| \|\\| \| \|
\| * \| \| \|	Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber	Jonathan Duran	2012-07-17
\| \|\ \ \ \
\| \| * \| \| \|	Multi Doc Zoom Slider Handling	Kruti Shah	2012-07-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-07-17
\| \| \|\ \ \ \
\| * \| \ \ \ \	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-07-17
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge branch 'refs/heads/NINJA-master' into TimelineUber	Jonathan Duran	2012-07-17
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \|
\| * \| / \| \| \|	Timeline: Possible fix for new file/new style crash problem.	Jon Reid	2012-07-17
\| \|/ / / / /
\| * \| \| \| \|	Timeline: Style zoom slider.	Jon Reid	2012-07-17
\| \| \| \| \| \|
\| * \| \| \| \|	Timeline: Bug fix: Now able to add first keyframe to an element using	Jon Reid	2012-07-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	function key.
\| * \| \| \| \|	Merge branch 'refs/heads/NINJA-master' into TimelineUber	Jonathan Duran	2012-07-17
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| / \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-07-16
\| \|\ \ \ \
\| \| * \| \| \|	Timeline: Ameliorate slowness when adding first keyframe to an element.	Jon Reid	2012-07-16
\| \| \| \| \| \|
\| \| * \| \| \|	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-07-16
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js Resolved by using both; both were needed.
\| \| * \| \| \| \|	Timeline: Disable drag-and-drop on subproperty keyframes. Better error	Jon Reid	2012-07-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	handling. Fix some minor bugs.
\| \| * \| \| \| \|	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-07-11
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local	Jon Reid	2012-07-09
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Timeline: Delete unused file.	Jon Reid	2012-07-09
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Styling of Zoom Slider + Grid Cut off limit taken care of + Hot text Bug ↵	Kruti Shah	2012-07-16
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(left,top,width,height) changing it now changes the element on stage Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| * \| \| \| \| \| \|	Zooming the tweens	Kruti Shah	2012-07-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| * \| \| \| \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-07-11
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Fix layer array	Jonathan Duran	2012-07-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \| \| \|	Fix more missing char	Jonathan Duran	2012-07-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \| \| \|	Fix missing char and Temp fix missing image	Jonathan Duran	2012-07-10
\| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| * \| \| \| \| \|	Adding Zoom Control to Property Tracks	Kruti Shah	2012-07-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| * \| \| \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti	Kruti Shah	2012-07-09
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	remove commas from var lines	Jonathan Duran	2012-07-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| * \| \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCode	Kruti Shah	2012-07-09
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \| \| \| \|	Adding comments	Kruti Shah	2012-07-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \| \| \| \|	Refactoring Code	Kruti Shah	2012-07-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \| \| \| \|	Remove Comment	Kruti Shah	2012-07-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
\| \| * \| \| \| \|	Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCode	Kruti Shah	2012-07-03
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|