| Commit message (Collapse) | Author | Age |
... | |
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | |_|/
| |/| |
| | | |
| | | | |
have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools.
|
| | | | |
|
| | | | |
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | | |
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
|
| | |/
| |/|
| | |
| | |
| | |
| | | |
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>
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/components/tools-properties/tag-properties.reel/tag-properties.html
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |\ \ |
|
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | | |
element models
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: Ananya Sen <Ananya.Sen@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: 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>
|
| |\ \ \ \ \ \ |
|
| | | |_|_|_|/
| | |/| | | | |
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | | |
Updating id to data-montage-id.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
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>
|
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/ / / / /
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Valerio Virgillito <valerio@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
|
| |\| | | | |
|
| |\ \ \ \ \ |
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
js/components/layout/bread-crumb.reel/bread-crumb.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
value.
|
| |\ \ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | |