| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| |\ | |||
| | * | Binding View - Hover Scroll | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| |\| | |||
| | * | Showing Bound Items in hud | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | Binding View - Added Line cap in drawing line & Fixed bug to not pop up on ↵ | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | | | | | current component Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-19 |
| |\| | |||
| | * | Binding View - Mouse Over Element Pop up Hud | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | Objects Tray - Show only "off stage" objects | Eric Guzman | 2012-06-19 |
| |/ | |||
| * | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-19 |
| |\ | | | | | | | | | Conflicts: js/stage/binding-view.reel/binding-view.js | ||
| | * | Bug: Text Tool Breaking canvas space. | Armen Kesablyan | 2012-06-19 |
| | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-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-internal | Armen Kesablyan | 2012-06-19 |
| | | |\ | |||
| | | | * | Merge pull request #308 from joseeight/Color | Valerio Virgillito | 2012-06-18 |
| | | | |\ | | | | | | | | | | | Fixing no color application to all elements. | ||
| | | | | * | Fixing binding of alpha slider/hottext in popup with panel | Jose Antonio Marquez | 2012-06-18 |
| | | | | | | |||
| | | | | * | Cleaning reel | Jose Antonio Marquez | 2012-06-17 |
| | | | | | | |||
| | | | | * | Cleaning up element references | Jose Antonio Marquez | 2012-06-17 |
| | | | | | | |||
| | | | | * | Tidying up color bar | Jose Antonio Marquez | 2012-06-17 |
| | | | | | | |||
| | | | | * | More cleaning up | Jose Antonio Marquez | 2012-06-16 |
| | | | | | | | | | | | | | | | | | | | | | Controller will need a review and refactoring. | ||
| | | | | * | Fixed slider/hottext bindings | Jose Antonio Marquez | 2012-06-16 |
| | | | | | | | | | | | | | | | | | | | | | Also cleaning up, however, needs much refactoring. | ||
| | | | | * | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-15 |
| | | | | |\ | |||
| | | | | * | | Fixing apply 'no color' | Jose Antonio Marquez | 2012-06-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This should fix canvas and standard DOM elements including the root (body or template wrapper). | ||
| | | | | * | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-15 |
| | | | | |\ \ | |||
| | | | | * \ \ | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-14 |
| | | | | |\ \ \ | |||
| | | | | * | | | | Cleaning up references | Jose Antonio Marquez | 2012-06-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still need to do more cleaning up. | ||
| | | | * | | | | | Merge pull request #309 from mqg734/IKNinja_1746 | Valerio Virgillito | 2012-06-18 |
| | | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | IKNINJA-1746 - Can't select items behind the banner templates' viewport. | ||
| | | | | * | | | | IKNINJA-1746 - Can't select items behind the banner templates' viewport. | Nivesh Rajbhandari | 2012-06-15 |
| | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | Merge pull request #306 from mqg734/GIO_Fixes | Valerio Virgillito | 2012-06-15 |
| | | | |\ \ \ \ | | | | |/ / / | | | |/| | | | Do not save ninja-specific body or html styles. | ||
| | | | | * | | | Remove ninja's author-time styles for banner and animation templates on ↵ | Nivesh Rajbhandari | 2012-06-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | publish/save. Missed the banner and animation case in the previous checkin. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | | * | | | Moving location to copy body style attribute | Jose Antonio Marquez | 2012-06-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with removing styles from other elements. This now only applies to HTML and Body tags | ||
| | | | | * | | | Adding clean up for ninja style attributes. | Jose Antonio Marquez | 2012-06-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I/O step in template. | ||
| | | | | * | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-06-14 |
| | | | | |\ \ \ | | | | | | |/ | | | | | |/| | |||
| | | | | * | | | Merge pull request #36 from mqg734/FileIO_Jose | Jose Antonio Marquez Russo | 2012-06-14 |
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | Save user's html and body styles and inline body styles for 3d so they don't get saved out with the document. | ||
| | | | | | * | | | Save user's html and body styles and inline body styles for 3d so they don't ↵ | Nivesh Rajbhandari | 2012-06-14 |
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get saved out with the document. This still requires some changes by Jose. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | Merge pull request #307 from mencio/youtube-fix | Valerio Virgillito | 2012-06-15 |
| | | | |\ \ \ \ | | | | |_|/ / | | | |/| | | | merging Stuart youtube fix | ||
| | | | | * | | | merging Stuart youtube fix | Valerio Virgillito | 2012-06-14 |
| | | | |/ / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | | | Merge pull request #305 from joseeight/Document | Valerio Virgillito | 2012-06-14 |
| | | | |\ \ \ | | | | | | | | | | | | | | | Adding banner template | ||
| | | | | * | | | Adding banner template | Jose Antonio Marquez | 2012-06-14 |
| | | | | |/ / | | | | | | | | | | | | | | | | | | | Added 'leader board' template to banners. | ||
| | | | * | | | Merge pull request #304 from mqg734/GIO_Fixes | Valerio Virgillito | 2012-06-14 |
| | | | |\ \ \ | | | | | | | | | | | | | | | IKNinja-1710 - Boundary box is drawn offset when switching between docs. This issue is related to move object to negative space. | ||
| | | | | * | | | IKNinja-1710 - Boundary box is drawn offset when switching between docs. ↵ | Nivesh Rajbhandari | 2012-06-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue is related to move object to negative space. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | Merge pull request #302 from joseeight/Color | Valerio Virgillito | 2012-06-14 |
| | | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | Color fixes | ||
| | | | | * | | | Fix: IKNINJA-1608 | Jose Antonio Marquez | 2012-06-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing icon, seems low res and improper size, should be hi-res PNG for future reference, using negative space offset to better display. | ||
| | | | | * | | | Clean up | Jose Antonio Marquez | 2012-06-13 |
| | | | | | | | | |||
| | | | | * | | | Fix: IKNINJA-1187 | Jose Antonio Marquez | 2012-06-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up and fixing masking of color wheel. | ||
| | | | | * | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-13 |
| | | | | |\ \ \ | | | | | | |/ | | | | | |/| | |||
| | | | | * | | | Cleaning up color wheel component | Jose Antonio Marquez | 2012-06-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor code clean up and refactoring. | ||
| | | | * | | | | Merge pull request #301 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-06-14 |
| | | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | Brushtool | ||
| | | | | * | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-06-13 |
| | | | | |\ \ \ | | | | | | |/ | | | | | |/| | |||
| | | | | * | | | fix bug #1718 (trying to delete a non-existent canvas) | Pushkar Joshi | 2012-06-13 |
| | | | | | | | | |||
| | | | | * | | | fix bug #1704 where small paths/strokes with large stroke width caused a ↵ | Pushkar Joshi | 2012-06-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flip of the gradient colors | ||
| | | | | * | | | correct path resizing in case of stroke width other than 1 | Pushkar Joshi | 2012-06-13 |
| | | | | | | | | |||