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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document	Jose Antonio Marquez	2012-05-07
\|\
\| *	Merge pull request #195 from mqg734/Dom-Architecture	Valerio Virgillito	2012-05-04
\| \|\ \| \| \| \| \| \|	Fixes for 3d, selection, and keyboard shortcuts
\| \| *	Temporarily skipping activeDocument.currentView check so keyboard shortcuts ↵	Nivesh Rajbhandari	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	still work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| *	Fixing references to iframe's styles in new template.	Nivesh Rajbhandari	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| *	Draw 3d grid by default since app model is not hooked up yet.	Nivesh Rajbhandari	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| *	Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture	Nivesh Rajbhandari	2012-05-04
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'refs/heads/master' into dom-architecture	Valerio Virgillito	2012-05-04
\| \|\ \
\| \| * \|	reverting to v0.8 flow component for the picasa carousel	Valerio Virgillito	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	Fixing the color popup	Valerio Virgillito	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	Fixing the tools list separators and document bar disabled state	Valerio Virgillito	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	temporary commenting a timeline bug preventing nested selection	Valerio Virgillito	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	fixing the currentContainer	Valerio Virgillito	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \|	Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id	Valerio Virgillito	2012-05-03
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| * \	Merge branch 'refs/heads/master' into tag-2.0	Valerio Virgillito	2012-05-03
\| \| \| \|\ \
\| \| \| * \ \	Merge branch 'refs/heads/master' into tag-2.0	Valerio Virgillito	2012-05-03
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| * \| \| \|	Refactor creating elements. Removed makeNJElement and separated the model ↵	Valerio Virgillito	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| * \| \| \|	Merge branch 'refs/heads/master' into tag-2.0	Valerio Virgillito	2012-05-03
\| \| \| \|\ \ \ \
\| \| \| * \| \| \| \|	Nesting absolute element in the Tag tool. Refactoring element creation and ↵	Valerio Virgillito	2012-05-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| * \| \| \| \|	code cleanup	Valerio Virgillito	2012-05-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	integrating the latest montage version	Valerio Virgillito	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	Removing unused components references	Valerio Virgillito	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	Fixing the lock button css	Valerio Virgillito	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	finishing to replace all id with data-montage-id	Valerio Virgillito	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	Removing more id and changing the appropriate CSS for them	Valerio Virgillito	2012-05-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \|	Merge branch 'refs/heads/master' into data-id	Valerio Virgillito	2012-05-03
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'refs/heads/master' into data-id	Valerio Virgillito	2012-05-03
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge pull request #190 from ananyasen/master-data-id	Valerio Virgillito	2012-05-03
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use data-montage-id instead of id in template
\| \| \| * \| \| \| \| \| \|	use data-montage-id instead of id in template	Ananya Sen	2012-05-03
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| \| * \| \| \| \| \| \|	Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-id	Valerio Virgillito	2012-05-03
\| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Changing ID to Montage-ID for Color Panel	Jose Antonio Marquez	2012-05-03
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Changing ID to Montage-ID for Color Components	Jose Antonio Marquez	2012-05-03
\| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'refs/heads/master' into data-id	Valerio Virgillito	2012-05-03
\| \| \|\\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge pull request #183 from mqg734/data-id	Valerio Virgillito	2012-04-30
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updating id to data-montage-id.
\| \| \| * \| \| \| \| \| \|	Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵	Nivesh Rajbhandari	2012-04-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \| \| \| \| \| \|	fixing the menu and tool properties	Valerio Virgillito	2012-04-30
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \| \|	converting the layout folder to use data-montage-id	Valerio Virgillito	2012-04-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| \| \| \| \| \| \| *	Fixing body's default styles.	Nivesh Rajbhandari	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| \| \| \| \| \| *	Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture	Nivesh Rajbhandari	2012-05-04
\| \| \| \| \| \| \| \| \|\ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/document/templates/montage-web/default_html.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \|	Merge pull request #193 from joseeight/Document	Valerio Virgillito	2012-05-03
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|	New Document View
\| \| \| \| \| \| \| \| *	Removed special-casing for new template workflow. Instead, we will enforce ↵	Nivesh Rajbhandari	2012-05-04
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a width and height on the body in order to do 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| \| \| \| \| \| *	Fixing selection and layout code to exclude SCRIPT and STYLE tags.	Nivesh Rajbhandari	2012-05-04
\| \| \| \| \| \| \| \|/ \| \| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \| \|