| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | | * | | Merge pull request #41 from mencio/video-fix | Jose Antonio Marquez Russo | 2012-06-29 | |
| | | | |\ \ | | | | | | | | | | | | | Fixing the video bug | |||
| | | | | * | | fixing some | Valerio Virgillito | 2012-06-29 | |
| | | | |/ / | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | | * | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-29 | |
| | | | |\ \ | ||||
| | | | * | | | 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 #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 branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-29 | |
| |\| | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | | | | | | | | | | Merge pull request #362 from mqg734/ColorGradientFix | Valerio Virgillito | 2012-06-29 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | Fixed not being able to draw linear and radial gradients and two other tools bugs. | |||
| | | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ColorGradientFix | Nivesh Rajbhandari | 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> | |||
| | * | | | | | | | | | | | | | | | | 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 | |
| | | | |/ / / / / / / / / / / / | ||||