| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-29 |
| |\ | |||
| | * | 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> | ||
| * | | | | Fixing reference to object | Jose Antonio Marquez | 2012-06-28 |
| | | | | | |||
| * | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-28 |
| |\| | | | |||
| | * | | | 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 #40 from mencio/video-fix | Jose Antonio Marquez Russo | 2012-06-28 |
| |\ \ \ \ | | | | | | | | | | | Video fix cleanup | ||
| | * | | | | video autopsy fix: moving the event handler on creation | Valerio Virgillito | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/Document' into video-fix | Valerio Virgillito | 2012-06-28 |
| | |\ \ \ \ | |/ / / / |/| / / / | |/ / / | |||
| * | | | | Relocating code | Jose Antonio Marquez | 2012-06-28 |
| | | | | | | | | | | | | | | | | | I added the fix in the wrong location before, this is more proper, still needs to be moved to where the video element is created or added to the DOM (in this spot the event is added every time src is changed). | ||
| * | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-28 |
| |\ \ \ \ | |||
| * | | | | | Fixing video autoplay bug in PI | Jose Antonio Marquez | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | Adding functionality to prevent autoplay on videos while in author-time. Fixes chrome preview issues. | ||
| * | | | | | Preventing video playback on open | Jose Antonio Marquez | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | This stops all videos from playing on open file. The same fix needs to be applied when an users sets autoplay in the PI. | ||
| * | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-28 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||
| * | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-28 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-27 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-25 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-22 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-22 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-21 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-21 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | | * | | 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-inter | ||