| Commit message (Collapse) | Author | Age |
... | |
| |/
| |
| |
| | |
Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
| |
| |
| |
| |
| |
| | |
- switching between multiple code and design view documents
- Note: closing of documents, when multiple documents are open, is not yet implemented
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |\
| | | |
| | | |
| | | | |
WorkingBranch
|
| | | | |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\| | | |
| | | | |
| | | | |
| | | | | |
github.com:Motorola-Mobility/ninja-internal into binding
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
=== true on document open.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\ \ \ \
| | | |_|/
| | |/| | |
|
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
Uncaught TypeError: Cannot read property 'documentRoot' of null js/components/layout/bread-crumb.reel/bread-crumb.js:26
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| |\| | |
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |\ \ |
|
| | | |\| |
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
- cleaning up
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/ / / / |
|
|/ / / /
| | | |
| | | |
| | | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\ \ \ \ |
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | | |
https://github.com/mencio/ninja-internal into serialization
|
| | | |_|/
| | |/| |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/ / /
| | | |
| | | |
| | | | |
preparation for montage converting to the new "prototype" format fully
|
|\| | | |
|
| |\ \ \ |
|
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
in zoom code.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/components/layout/bread-crumb.reel/bread-crumb.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Initial container get setup in ninja now.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/ /
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
|\| | |
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/document/templates/montage-html/default_html.css
js/mediators/element-mediator.js
js/panels/properties.reel/properties.js
js/tools/BrushTool.js
js/tools/LineTool.js
js/tools/PenTool.js
js/tools/SelectionTool.js
js/tools/ShapeTool.js
js/tools/TranslateObject3DTool.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
rotate tool and 3D object translate tool.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|