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

	Commit message (Collapse)	Author	Age
*	Merge branch 'refs/heads/master' into binding	Armen Kesablyan	2012-06-19
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| *	Fixing properties panel to support px and % for body and other elements.	Nivesh Rajbhandari	2012-06-12
\| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \|	Objects Panel - removed for now	Eric Guzman	2012-06-15
\| \|
* \|	Merge branch 'refs/heads/master' into binding	Armen Kesablyan	2012-06-11
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| *	Merge pull request #280 from pushkarjoshi/brushtool	Valerio Virgillito	2012-06-08
\| \|\ \| \| \| \| \| \|	Brushtool
\| \| *	change units for smoothing and calligraphic angle in PI	Pushkar Joshi	2012-06-07
\| \| \|
\| \| *	change the PI to make it look like the fill color affects the brush stroke color	Pushkar Joshi	2012-06-07
\| \| \|
\| * \|	Merge branch 'refs/heads/master' into element-model-fixes	Valerio Virgillito	2012-06-06
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	Merge branch 'master' into pentool	Pushkar Joshi	2012-06-04
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/tools/PenTool.js
\| \| * \	Merge branch 'master' into pentool	Pushkar Joshi	2012-05-31
\| \| \|\ \
\| \| * \| \|	allow changes in the pen subtool in options to be seen by the pen tool code ↵	Pushkar Joshi	2012-05-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(can now select the pen plus, pen minus subtools) AND add keyboard shortcut for brush tool
\| * \| \| \|	disabling the menu when closing all files	Valerio Virgillito	2012-06-05
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	fixing the menu bindings and some cleanup of the stage	Valerio Virgillito	2012-05-29
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	Binding tool subtool issues	Armen Kesablyan	2012-05-23
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* \| \|	Merge branch 'refs/heads/dom-architecture' into binding	Armen Kesablyan	2012-05-23
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \|	CSS Panel - Update components to use new serialization format	Eric Guzman	2012-05-22
\| \| \|
\| * \|	Remove Old CSS Panel	Eric Guzman	2012-05-21
\| \| \|
\| * \|	Merge branch 'dom-architecture' of ↵	Eric Guzman	2012-05-18
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
\| \| * \|	fixed the shape subtool not refreshing the icon	Valerio Virgillito	2012-05-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \|	Merge branch 'dom-architecture' of ↵	Eric Guzman	2012-05-17
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/document/templates/montage-html/default_html.css js/lib/NJUtils.js
\| * \| \|	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-05-17
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-05-10
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
\| * \ \ \	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-04-30
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-04-23
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-04-23
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-04-09
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-04-05
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'refs/heads/master' into CSSPanelUpdates	Eric Guzman	2012-04-02
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	CSS Panel - Add new panel to panel data	Eric Guzman	2012-03-13
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/dom-architecture' into binding	Armen Kesablyan	2012-05-17
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
\| * \| \| \| \| \| \| \| \| \|	code cleanup and refactoring of the document controller and stage view	Valerio Virgillito	2012-05-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/master' into dom-architecture	Valerio Virgillito	2012-05-16
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| * \| \| \| \| \| \| \| \|	Removed unused SubSelect Tool	John Mayhew	2012-05-08
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	John Mayhew	2012-05-07
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
\| \| * \| \| \| \| \| \| \| \|	More implementation of moving color chips to the individual subtools.	John Mayhew	2012-05-07
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools
\| * \| \| \| \| \| \| \| \|	fixing some of the document bindings.	Valerio Virgillito	2012-05-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \| \| \|	Objects Panel - Hook in objects panel	Eric Guzman	2012-05-16
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'dom-architecture' of ↵	Armen Kesablyan	2012-05-15
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:Motorola-Mobility/ninja-internal into binding
\| * \| \| \| \| \| \| \| \|	fixing the body pi	Valerio Virgillito	2012-05-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \| \| \|	Finished skeleton structure for binding.	Armen Kesablyan	2012-05-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Armen Kesablyan <armen@motorola.com>
* \| \| \| \| \| \| \| \| \|	Workspace: has customized	Armen Kesablyan	2012-05-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|