| Commit message (Collapse) | Author | Age |
|\ |
|
| | |
|
| | |
|
| |\
| | |
| | |
| | | |
github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/document/templates/montage-html/default_html.css
js/lib/NJUtils.js
|
| | |
| | |
| | |
| | | |
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>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |\ \ |
|
| | | | | |
|
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | | |
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
|
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| |\ \ \ \ |
|
| |\ \ \ \ \ |
|
| |\ \ \ \ \ \ |
|
| |\ \ \ \ \ \ \ |
|
| |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | |
|
| |_|_|_|_|_|_|_|/
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
(can now select the pen plus, pen minus subtools) AND
add keyboard shortcut for brush tool
|
| | | | | | | | | |
|
|\ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | |_|_|_|_|_|/
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
element models
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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>
|
|\ \ \ \ \
| | | | | |
| | | | | | |
IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for PaintBucket, InkBottle and Eyedropper tools.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
PaintBucket, InkBottle and Eyedropper tools.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
js/controllers/elements/element-controller.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |_|_|/
| |/| | |
| | | | |
| | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|/ / / /
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\ \ \ \
| |_|_|/
|/| | | |
3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes.
|
| | |/
| |/|
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ \ \
| | | |
| | | | |
Components panel cleanup and displaying only simple properties.
|
| |\| | |
|
| |\ \ \ |
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Renamed to naming convention. Deleted un-used file.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |_|_|/ /
|/| | | |
| | | | |
| | | | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
added text paste detection and updated some menu items
|
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
Disabled cut, copy, paste, debug, since that functionality is not there yet
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|\ \ \ \
| |/ / /
|/| | | |
Brushtool
|
| |\| |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/controllers/elements/shapes-controller.js
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
and code cleanup
GOOD status before doing 3D unprojection step
|
| | | |
| | | |
| | | |
| | | | |
path
|
| | |/
| | |