| Commit message (Collapse) | Author | Age |
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/components/menu/menu-entry.reel/menu-entry.js
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>
|
| | |
| | |
| | |
| | |
| | |
| | | |
menu does not work when a main menu drop down is already displayed.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
is opened
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|\| | |
|
| | | |
|
| | | |
|
| |/ |
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
|
| |
| |
| |
| | |
Clean up and fixing masking of color wheel.
|
| |\ |
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
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>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
js/io/system/ninjalibrary.json
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
js/components/tools-properties/fill-properties.reel/fill-properties.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
the latest montage
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | | |
|
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |/ / /
| |/| | |
| | | | |
| | | | | |
Minor code clean up and refactoring.
|
| |\| | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fixed the currentSelectedContainer by removing bindings and using property change on the current document
added the red outline back.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/ / /
| | | |
| | | |
| | | | |
Added a temp prompt component and added on before close logic to ensure user does not lose data if the file needs saving when they close.
|
|\| | | |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
js/document/models/html.js
js/document/views/design.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |\ \ \
| | | |_|/
| | |/| | |
Pentool
|
| | | |\|
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
js/tools/PenTool.js
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Pen minus subtool not removing 1 anchor paths
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
(can now select the pen plus, pen minus subtools) AND
add keyboard shortcut for brush tool
|
| |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
js/mediators/element-mediator.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |_|_|/
| |/| | |
| | | | |
| | | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| |/ / /
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/controllers/elements/element-controller.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\ \ \
| | | |/
| | |/|
| | | | |
document-bindings-fix
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
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: Valerio Virgillito <valerio@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|