aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-15
|\
| * Put Objects in front of HudsArmen Kesablyan2012-06-15
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-15
| |\
| * \ Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-15
| |\ \
| * | | Binding Hud: Calling Option Selection to viewArmen Kesablyan2012-06-15
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Objects Tray - Add hiding based on workspace mode.Eric Guzman2012-06-15
| |_|/ |/| |
* | | Merge pull request #14 from ericguzman/bindingArmen Kesablyan2012-06-15
|\ \ \ | |_|/ |/| | Binding
| * | Objects Panel - removed for nowEric Guzman2012-06-15
| | |
| * | Objects Tray - Add objects tray to binding viewEric Guzman2012-06-15
| | |
| * | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-14
| |\|
* | | Merge pull request #13 from ericguzman/bindingArmen Kesablyan2012-06-15
|\| | | |/ |/| Added Objects Tray
| * Edit Binding - Binding improvements to show icon and save formEric Guzman2012-06-13
| |
| * Objects Panel - Fix CSS to simplify showing object icons in other panelsEric Guzman2012-06-13
| |
| * Objects Controller - Fix call to get current object bindings after ↵Eric Guzman2012-06-13
| | | | | | | | add/removing binding
* | Binding-Huds draw to componentArmen Kesablyan2012-06-14
|/ | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge pull request #12 from ericguzman/bindingArmen Kesablyan2012-06-13
|\ | | | | Binding Panel update
| * Binding Panel - Dock the edit view when transition ends so horizontal ↵Eric Guzman2012-06-13
| | | | | | | | resizing works
| * Objects Controller - Update current object bindings when adding/removing ↵Eric Guzman2012-06-13
| | | | | | | | bindings
| * Edit Binding - Update LayoutEric Guzman2012-06-13
| |
| * Binding Panel - set up new edit view layoutEric Guzman2012-06-12
| |
| * Binding View - Use same icon component as objects panelEric Guzman2012-06-12
| |
| * Components - Add object instance to model's objects arrayEric Guzman2012-06-12
| |
| * Objects Controller - Add concept of categoriesEric Guzman2012-06-12
| |
| * Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-11
| |\
| * | Objects Panel - CSS and serialization updateEric Guzman2012-06-11
| | |
| * | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-11
| |\ \
| * | | Objects Panel - Add component icon and icons by typeEric Guzman2012-06-11
| | | |
* | | | Binding-View: Translate hudsArmen Kesablyan2012-06-13
| |_|/ |/| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | Changes Made to Object Listing of iFrameArmen Kesablyan2012-06-11
| | | | | | | | | | | | 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
| |\ \
| | * \ Merge pull request #286 from mqg734/ScrollBarFixValerio Virgillito2012-06-11
| | |\ \ | | | | | | | | | | Overriding scrollbar styles on the template so the scroll track is not white.
| | | * \ Merge branch 'refs/heads/ninja-internal' into ScrollBarFixNivesh Rajbhandari2012-06-08
| | | |\ \
| | | * | | Removing iframeContainer scroll styles since the scrollbars are not drawn in ↵Nivesh Rajbhandari2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the iframeContainer now. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Overriding scrollbar styles on the template so the scroll track is not ↵Nivesh Rajbhandari2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | white. This has the side benefit of fixing some of the zoom issues with the scrollbar too. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Merge pull request #287 from joseeight/FileIOValerio Virgillito2012-06-11
| | |\ \ \ \ | | | |_|/ / | | |/| | | Re-adding temp doc type
| | | * | | Re-adding temp doc typeJose Antonio Marquez2012-06-09
| | |/ / / | | | | | | | | | | | | | | | Adding a demo fix to include the document type, it is removed because comments are not supported currently, so we must added in manually. The YouTube component breaks, it does not support any doctype, hence, the component must have a bug filed against it, we MUST include doc types with our files.
| | * | | Merge pull request #285 from joseeight/FileIOValerio Virgillito2012-06-08
| | |\ \ \ | | | | | | | | | | | | Remove doc type from files and adding tag check for html
| | | * | | Remove doc type from files and adding tag check for htmlJose Antonio Marquez2012-06-08
| | | |/ / | | | | | | | | | | | | | | | Removed the HTML5 doctype from files since it was break the YouTube component, also made a fix to check for the HTML tag to be present when copying attributes.
| | * | | Merge pull request #284 from mencio/timeline-resizer-fixValerio Virgillito2012-06-08
| | |\ \ \ | | | | | | | | | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error
| | | * | | IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2Valerio Virgillito2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | Merge branch 'refs/heads/master' into timeline-resizer-fixValerio Virgillito2012-06-08
| | | |\| |
| | | * | | IKNINJA-1702: Fix the timeline resized throwing a debugger errorValerio Virgillito2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge pull request #280 from pushkarjoshi/brushtoolValerio Virgillito2012-06-08
| | |\ \ \ \ | | | |_|/ / | | |/| | | Brushtool
| | | * | | fix compile error that was preventing non-gradient brush strokes from being ↵Pushkar Joshi2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | rendered in runtime
| | | * | | change units for smoothing and calligraphic angle in PIPushkar Joshi2012-06-07
| | | | | |
| | | * | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-07
| | | |\ \ \
| | | * | | | change the PI to make it look like the fill color affects the brush stroke colorPushkar Joshi2012-06-07
| | | | | | |
| | | * | | | enable gradients for brush stroke (in authoring as well as runtime)Pushkar Joshi2012-06-06
| | | | | | |
| | | * | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-06-06
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:54:25 +0000