aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-02
|\
| * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| |\
| | * Merge branch 'refs/heads/ninja-internal' into ColorGradientFixNivesh Rajbhandari2012-06-29
| | |\
| | * | Fixed not being able to draw linear and radial gradients. Also fixed ↵Nivesh Rajbhandari2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1721 - File dirty marker does not show when modifying elements and IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects. Squashed commit of the following: commit 7cad082c89911d34a99feeef8e91d22b89cae8f1 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 17:52:07 2012 -0700 Fix for not being able to draw linear and radial gradient materials. I'm turning off pre-flight support of gradients for WebGL since it conflicts with the materials' color support. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit d0df8a2bff052d855bafb7885792b1dfff8eab7d Merge: 2c67d26 b4b54f6 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 17:50:11 2012 -0700 Merge branch 'refs/heads/ninja-internal' into ToolFixes commit 2c67d264851f0897fdca8ca887c1c82d0e434217 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 15:06:13 2012 -0700 IKNINJA-1721 - File dirty marker does not show when modifying elements. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit bb4b6a52eb75efb2f435cdb53f810ae3bc1f1fc3 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 11:15:34 2012 -0700 IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Fixing reference to objectJose Antonio Marquez2012-06-28
| | | |
| * | | video autopsy fix: moving the event handler on creationValerio Virgillito2012-06-28
| | |/ | |/| | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge pull request #355 from dhg637/GIO_binding-viewValerio Virgillito2012-06-28
| |\ \ | | |/ | |/| Gio binding view bugs and fixes
| | * Binding View - Bug fix After save corrupts doom and breaks binding viewArmen Kesablyan2012-06-28
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-26
| |\ \
| * \ \ Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-26
| |\ \ \
| * | | | Support pre-flighting of gradients for shape tools - rect, line, oval, brush ↵Nivesh Rajbhandari2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and pen. Note that WebGL shapes are not supported yet. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Tag tool pre-flight should support gradients.Nivesh Rajbhandari2012-06-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Bug: Font Name & Size not updating text toolArmen Kesablyan2012-07-02
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Binding View - Hide in Live PreviewArmen Kesablyan2012-06-26
| |_|/ |/| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
|\ \ \ | |_|/ |/| | Binding View - Binding Tool & Binding Panel
| * | Binding View: Fixed If Selected Div Erroring OutArmen Kesablyan2012-06-23
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | Text Tool Fix - Can Not Switch Document when Text Tool InitializedArmen Kesablyan2012-06-23
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-21
| | |\|
| * | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| | |\ \
| * | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| |\| | |
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| | |\ \ \
| * | | | | Binding View - Mouse Over Element Pop up HudArmen Kesablyan2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-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>
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-19
| | |\ \ \ \
| * | | | | | Binding View - validate over hudsArmen Kesablyan2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-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 branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-11
| | |\ \ \ \ \
| | * | | | | | Initial Text Tool ChangesArmen Kesablyan2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | Binding-View : Deselect Works Now, Rendering multiple Huds AvailableArmen Kesablyan2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | Changes for binding ViewArmen Kesablyan2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | binding canvasArmen Kesablyan2012-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | Binding View Canvas Initial DevelopmentArmen Kesablyan2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | Visual Bindings Initial generate from Array.Armen Kesablyan2012-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-25
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-23
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | Binding Visual Tool Initial setupArmen Kesablyan2012-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | | Initial Binding HudArmen Kesablyan2012-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | | Merge branch 'dom-architecture' of ↵Armen Kesablyan2012-05-15
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into binding
| * | | | | | | | | | | removed debugger lineArmen Kesablyan2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | |