| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding | Armen Kesablyan | 2012-06-15 |
| |\ | |||
| | * | Merge pull request #13 from ericguzman/binding | Armen Kesablyan | 2012-06-15 |
| | |\ | | | | | | | Added Objects Tray | ||
| | | * | Edit Binding - Binding improvements to show icon and save form | Eric Guzman | 2012-06-13 |
| | | | | |||
| | | * | Objects Panel - Fix CSS to simplify showing object icons in other panels | Eric Guzman | 2012-06-13 |
| | | | | |||
| | | * | Objects Controller - Fix call to get current object bindings after ↵ | Eric Guzman | 2012-06-13 |
| | | | | | | | | | | | | | add/removing binding | ||
| * | | | Binding Hud: Calling Option Selection to view | Armen Kesablyan | 2012-06-15 |
| |/ / | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * / | Binding-Huds draw to component | Armen Kesablyan | 2012-06-14 |
| |/ | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | Merge pull request #12 from ericguzman/binding | Armen Kesablyan | 2012-06-13 |
| |\ | | | | | Binding Panel update | ||
| | * | Binding Panel - Dock the edit view when transition ends so horizontal ↵ | Eric Guzman | 2012-06-13 |
| | | | | | | | | | resizing works | ||
| | * | Objects Controller - Update current object bindings when adding/removing ↵ | Eric Guzman | 2012-06-13 |
| | | | | | | | | | bindings | ||
| | * | Edit Binding - Update Layout | Eric Guzman | 2012-06-13 |
| | | | |||
| | * | Binding Panel - set up new edit view layout | Eric Guzman | 2012-06-12 |
| | | | |||
| | * | Binding View - Use same icon component as objects panel | Eric Guzman | 2012-06-12 |
| | | | |||
| | * | Components - Add object instance to model's objects array | Eric Guzman | 2012-06-12 |
| | | | |||
| | * | Objects Controller - Add concept of categories | Eric Guzman | 2012-06-12 |
| | | | |||
| | * | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-11 |
| | |\ | |||
| | * | | Objects Panel - CSS and serialization update | Eric Guzman | 2012-06-11 |
| | | | | |||
| | * | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-11 |
| | |\ \ | |||
| | * | | | Objects Panel - Add component icon and icons by type | Eric Guzman | 2012-06-11 |
| | | | | | |||
| * | | | | Binding-View: Translate huds | Armen Kesablyan | 2012-06-13 |
| | |_|/ |/| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | Changes Made to Object Listing of iFrame | Armen Kesablyan | 2012-06-11 |
| | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-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-internal | Armen Kesablyan | 2012-06-11 |
| | |\ \ | |||
| | | * \ | Merge pull request #286 from mqg734/ScrollBarFix | Valerio Virgillito | 2012-06-11 |
| | | |\ \ | | | | | | | | | | | Overriding scrollbar styles on the template so the scroll track is not white. | ||
| | | | * \ | Merge branch 'refs/heads/ninja-internal' into ScrollBarFix | Nivesh Rajbhandari | 2012-06-08 |
| | | | |\ \ | |||
| | | | * | | | Removing iframeContainer scroll styles since the scrollbars are not drawn in ↵ | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-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/FileIO | Valerio Virgillito | 2012-06-11 |
| | | |\ \ \ \ | | | |_|/ / | | |/| | | | Re-adding temp doc type | ||
| | | | * | | | Re-adding temp doc type | Jose Antonio Marquez | 2012-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/FileIO | Valerio Virgillito | 2012-06-08 |
| | | |\ \ \ | | | | | | | | | | | | | Remove doc type from files and adding tag check for html | ||
| | | | * | | | Remove doc type from files and adding tag check for html | Jose Antonio Marquez | 2012-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-fix | Valerio Virgillito | 2012-06-08 |
| | | |\ \ \ | | | | | | | | | | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error | ||
| | | | * | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2 | Valerio Virgillito | 2012-06-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | Merge branch 'refs/heads/master' into timeline-resizer-fix | Valerio Virgillito | 2012-06-08 |
| | | | |\| | | |||
| | | | * | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error | Valerio Virgillito | 2012-06-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | Merge pull request #280 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-06-08 |
| | | |\ \ \ \ | | | |_|/ / | | |/| | | | Brushtool | ||
| | | | * | | | fix compile error that was preventing non-gradient brush strokes from being ↵ | Pushkar Joshi | 2012-06-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | rendered in runtime | ||
| | | | * | | | change units for smoothing and calligraphic angle in PI | Pushkar Joshi | 2012-06-07 |
| | | | | | | | |||
| | | | * | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-06-07 |
| | | | |\ \ \ | |||
| | | | * | | | | change the PI to make it look like the fill color affects the brush stroke color | Pushkar Joshi | 2012-06-07 |
| | | | | | | | | |||
| | | | * | | | | enable gradients for brush stroke (in authoring as well as runtime) | Pushkar Joshi | 2012-06-06 |
| | | | | | | | | |||
| | | | * | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-06-06 |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js | ||
| | | | * \ \ \ \ | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-06-06 |
| | | | |\ \ \ \ \ | |||
| | | | * | | | | | | removed repeated declarations in brush stroke runtime class | Pushkar Joshi | 2012-06-04 |
| | | | | | | | | | | |||
| | | | * | | | | | | runtime version of the brush stroke (similar to the pen paths, this seems to ↵ | Pushkar Joshi | 2012-05-31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not work unless we run it through the debugger) | ||
| | | | * | | | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-05-31 |
| | | | |\ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-05-22 |
| | | | |\ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-05-22 |
| | | | |\ \ \ \ \ \ \ \ | |||
| | | * | \ \ \ \ \ \ \ \ | Merge pull request #283 from mqg734/BodyPI | Valerio Virgillito | 2012-06-07 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Body PI fixes. | ||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into BodyPI | Nivesh Rajbhandari | 2012-06-07 |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/body-controller.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||