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

	Commit message (Expand)	Author	Age
*	Undoing bad auto-merge resize-composer.js.	Nivesh Rajbhandari	2012-04-05
*	Undoing some minor spacing differences from auto-merge.	Nivesh Rajbhandari	2012-04-05
*	Undoing mistakes from auto-merge.	Nivesh Rajbhandari	2012-04-05
*	Merge branch 'refs/heads/ToolFixes' into WebGLMaterials	Nivesh Rajbhandari	2012-04-04
\|\
\| *	Merge branch 'refs/heads/WebGLFileIO' into ToolFixes	Nivesh Rajbhandari	2012-04-04
\| \|\
\| \| *	Merge branch 'refs/heads/EricSnapping' into WebGLFileIO	Nivesh Rajbhandari	2012-04-04
\| \| \|\
\| \| \| *	merge from main	hwc487	2012-03-29
\| * \| \|	Styling PI's Materials edit button.	Nivesh Rajbhandari	2012-04-04
\| * \| \|	Merge pull request #149 from dhg637/BugFixes	Valerio Virgillito	2012-04-04
\| \|\ \ \
\| \| * \ \	Merge branch 'refs/heads/master' into BugFixes	Armen Kesablyan	2012-04-04
\| \| \|\ \ \
\| \| * \| \| \|	Resizing Bugs	Armen Kesablyan	2012-03-29
\| \| * \| \| \|	Bug #1073: Panels interact with hottest drag drop	Armen Kesablyan	2012-03-28
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge branch 'refs/heads/master' into PresetsPI	Eric Guzman	2012-04-04
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Squashed commit of Preparing for the montage undo-manager: Architecture changes	Valerio Virgillito	2012-04-04
\| \| \| \|/ \| \| \|/\|
\| \| * \|	CSS Panel - Fix animation duration value updates from "infinite" to integer.	Eric Guzman	2012-03-29
\| \| \|/
\| * \|	Merge branch 'refs/heads/master' into PresetsPI	Eric Guzman	2012-03-29
\| \|\\|
\| \| *	Merge pull request #145 from ericguzman/PresetsPI	Valerio Virgillito	2012-03-28
\| \| \|\
\| \| * \	Merge pull request #139 from dhg637/ResizersRefactoring	Valerio Virgillito	2012-03-28
\| \| \|\ \
\| \| \| * \|	Resizers updated	Armen Kesablyan	2012-03-23
\| \| \| * \|	Merge branch 'refs/heads/master' into DataBinding	Armen Kesablyan	2012-03-22
\| \| \| \|\ \
\| \| \| * \| \|	Updated Resizers for Panels and timeline	Armen Kesablyan	2012-03-22
\| * \| \| \| \|	Presets - Remove style transition when transition doesn't start. Also added t...	Eric Guzman	2012-03-29
\| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge branch 'refs/heads/master' into PresetsPI	Eric Guzman	2012-03-27
\| \|\\| \| \|
\| * \| \| \|	Presets Panel - Adding presets controller and removing functionality from pan...	Eric Guzman	2012-03-22
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'refs/heads/ninja-internal' into WebGLMaterials	Nivesh Rajbhandari	2012-03-27
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #142 from joseeight/Color	Valerio Virgillito	2012-03-26
\| \|\ \ \
\| \| * \| \|	Fix: IKNINJA-1362	Jose Antonio Marquez	2012-03-26
\| \| \|/ /
\| * \| \|	Merge pull request #138 from joseeight/FileIO-Montage-Components	Valerio Virgillito	2012-03-23
\| \|\ \ \
\| \| * \ \	Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...	Jose Antonio Marquez	2012-03-23
\| \| \|\ \ \
\| \| * \| \| \|	Adding firstDraw event to components added	Jose Antonio Marquez	2012-03-22
\| * \| \| \| \|	Presets - fixed preset group name ("2D")	Eric Guzman	2012-03-23
\| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Presets Panel - Add slide/fade out animation	Eric Guzman	2012-03-23
\| * \| \| \|	Adding enabled/disabled support for PI's checkbox control.	Nivesh Rajbhandari	2012-03-22
\| \|/ / /
\| * \| \|	Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...	Valerio Virgillito	2012-03-21
\| \|\ \ \
\| \| * \| \|	Presets Panel - Add Font style preset	Eric Guzman	2012-03-21
\| * \| \| \|	Merge branch 'refs/heads/master' into montage-integration	Valerio Virgillito	2012-03-21
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...	Valerio Virgillito	2012-03-20
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Presets - Animation update	Eric Guzman	2012-03-20
\| * \| \| \|	Merge branch 'refs/heads/button-switch' into montage-integration	Valerio Virgillito	2012-03-20
\| \|\ \ \ \
\| \| * \| \| \|	fully removing our old button component from Ninja	Valerio Virgillito	2012-03-19
\| * \| \| \| \|	Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...	Valerio Virgillito	2012-03-19
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Maps - Apply default width and height styles to components if specified. Chan...	Nivesh Rajbhandari	2012-03-19
\| \| * \| \| \|	looping through both branches of the components tree	Valerio Virgillito	2012-03-18
\| * \| \| \| \|	Merge branch 'refs/heads/master' into montage-integration	Valerio Virgillito	2012-03-19
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| / / / \| \| \|/ / /
\| * \| \| \|	Youtube video is droppable	François Frisch	2012-03-17
\| * \| \| \|	Integrating picasa carousel and youtube channel	François Frisch	2012-03-17
\| * \| \| \|	adding element creation for the map and feedreader components.	Valerio Virgillito	2012-03-17
\| * \| \| \|	Adding components to PI	François Frisch	2012-03-17
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Adding logic for flatten checkbox in PI.	Nivesh Rajbhandari	2012-03-24
* \| \| \|	Tweaking some styles in the materials popup.	Nivesh Rajbhandari	2012-03-23