| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Fixes a bug in rectangle containment test. | hwc487 | 2012-06-29 |
| | | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-29 |
| |\ | | | | | | | GridFixes | ||
| | * | Merge pull request #350 from ericguzman/StylesController_6_27 | Valerio Virgillito | 2012-06-29 |
| | |\ | | | | | | | Styles Controller - Fix specificity comparison in hasGreaterSpecificity | ||
| | | * | Styles Controller - removing console logs | Eric Guzman | 2012-06-29 |
| | | | | |||
| | | * | Styles Controller - Fix specificity comparison in hasGreaterSpecificity() | Eric Guzman | 2012-06-27 |
| | | | | |||
| | * | | Merge pull request #356 from mencio/google-components-fixes | Valerio Virgillito | 2012-06-29 |
| | |\ \ | | | | | | | | | Fix for the youtube component close button on windows | ||
| | | * | | Fix for the youtube component close button on windows | Valerio Virgillito | 2012-06-28 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Merge pull request #351 from ananyasen/bugfix-master | Valerio Virgillito | 2012-06-28 |
| | |\ \ \ | | | | | | | | | | | fixed IKNINJA-1762 [Copy/Cut on canvas tag tool throws error on console] | ||
| | | * | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-master | Ananya Sen | 2012-06-28 |
| | | |\| | | |||
| | | * | | | fixed IKNINJA-1762 [Copy/Cut on canvas tag tool throws error on console] -> ↵ | Ananya Sen | 2012-06-27 |
| | | | |/ | | |/| | | | | | | | | | | | | | | | | | don't generate data-RDGE-id for simple canvas element Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | Merge pull request #358 from jreid01/timeline-pr | Valerio Virgillito | 2012-06-28 |
| | |\ \ \ | | | | | | | | | | | Timeline: Fix for deselect bug. | ||
| | | * | | | Timeline: Better deselection of tweens when selecting/deselecting layers. | Jon Reid | 2012-06-28 |
| | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolved: use mine (doesn't matter, affected code block is in commented out section) | ||
| | * | | | Merge pull request #361 from ericguzman/PresetsUpdate_6_28 | Valerio Virgillito | 2012-06-28 |
| | |\ \ \ | | | | | | | | | | | Presets/CSS Panel - Update css panel with preset class. | ||
| | | * | | | Presets/CSS Panel - Update css panel with preset class. | Eric Guzman | 2012-06-28 |
| | | | | | | |||
| | * | | | | Merge pull request #354 from mencio/IKNINJA-1829 | Valerio Virgillito | 2012-06-28 |
| | |\ \ \ \ | | | | | | | | | | | | | Fixing the button for the shape pi | ||
| | | * | | | | removing some comments | Valerio Virgillito | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | Fixing the button for the shape pi | Valerio Virgillito | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | Merge pull request #355 from dhg637/GIO_binding-view | Valerio Virgillito | 2012-06-28 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | | | Gio binding view bugs and fixes | ||
| | | * | | | | Binding View - Multi document bug : cleared object bindings when current ↵ | Armen Kesablyan | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document is changed Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internal ↵ | Armen Kesablyan | 2012-06-28 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into GIO_binding-view Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Eric Guzman | 2012-06-28 |
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | Bindables_GIO | ||
| | | | * | | | | Binding HUD - Updated CSS for hud and promoted/bound properties. | Eric Guzman | 2012-06-28 |
| | | | | | | | | |||
| | | * | | | | | Binding View - Bug fix After save corrupts doom and breaks binding view | Armen Kesablyan | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-27 |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internal | Armen Kesablyan | 2012-06-27 |
| | | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||
| | | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Eric Guzman | 2012-06-27 |
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bindables_GIO | ||
| | | | * | | | | | | Binding HUD - CSS Update | Eric Guzman | 2012-06-27 |
| | | | | | | | | | | |||
| | | | * | | | | | | Binding HUD - Show promoted PI properties at top of list | Eric Guzman | 2012-06-27 |
| | | | | | | | | | | |||
| | | * | | | | | | | Binding View - Hide in Live Preview | Armen Kesablyan | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | Binding Hud Not rendering at correct x and y | Armen Kesablyan | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | | | | Merge pull request #359 from mencio/live-preview-button | Valerio Virgillito | 2012-06-28 |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | Live preview button and canvas are kept on timeline play | ||
| | | * | | | | | | | Changing the livePreview button to do a chromePreview and keeping the canvas ↵ | Valerio Virgillito | 2012-06-28 |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when doing a timeline play Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * / / / / / / / | Fixes for incorrect line/polygon intersections. | hwc487 | 2012-06-28 |
| |/ / / / / / / | |||
| * | | | | | | | Merge pull request #349 from joseeight/Color | Valerio Virgillito | 2012-06-28 |
| |\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Color | ||
| | * | | | | | | Fixing body PI background getter | Jose Antonio Marquez | 2012-06-28 |
| | | | | | | | | |||
| | * | | | | | | Fixing chips updating with alpha change | Jose Antonio Marquez | 2012-06-28 |
| | | | | | | | | |||
| | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-28 |
| | |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||
| * | | | | | | | Merge pull request #353 from imix23ways/Timeline-criticalfix | Valerio Virgillito | 2012-06-28 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | FIX layer selection bug | ||
| | * | | | | | | | FIX layer selection bug | Jonathan Duran | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | Fixing body background bug | Jose Antonio Marquez | 2012-06-28 |
| | | | | | | | | | |||
| | | * | | | | | | Fixing init alpha issue | Jose Antonio Marquez | 2012-06-28 |
| | | | | | | | | | |||
| | | * | | | | | | Fixing color panel sliders updating | Jose Antonio Marquez | 2012-06-28 |
| | | | | | | | | | |||
| | | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-28 |
| | | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||
| * | | | | | | | | Merge pull request #352 from imix23ways/Timeline-IKNINJA-1843 | Valerio Virgillito | 2012-06-27 |
| |\| | | | | | | | |_|_|_|_|_|/ |/| | | | | | | Timeline: bug fix IKNINJA-1843 | ||
| | * | | | | | | Timeline: bug fix IKNINJA-1843 | Jon Reid | 2012-06-27 |
| |/ / / / / / | |||
| | * | | | | | Fixing history bug | Jose Antonio Marquez | 2012-06-27 |
| | | | | | | | |||
| | * | | | | | Fixing IKNINJA-1634 | Jose Antonio Marquez | 2012-06-27 |
| | | | | | | | |||
| | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-27 |
| | |\ \ \ \ \ | |/ / / / / |/| | | | | | |||
| * | | | | | | Merge pull request #347 from mqg734/ComponentShapeToolBug | Valerio Virgillito | 2012-06-27 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Temporarily disable ElementMediator's addDelegate when adding components. | ||
| | * | | | | | Temporarily disable ElementMediator's addDelegate when adding components. | Nivesh Rajbhandari | 2012-06-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||