aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | * | | | | Preventing video playback on openJose Antonio Marquez2012-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 DocumentJose Antonio Marquez2012-06-28
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-28
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-27
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-25
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-22
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-22
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-21
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-21
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-29
|\| | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | | | | | | | | | Merge pull request #362 from mqg734/ColorGradientFixValerio Virgillito2012-06-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | Fixed not being able to draw linear and radial gradients and two other tools bugs.
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ColorGradientFixNivesh Rajbhandari2012-06-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge pull request #350 from ericguzman/StylesController_6_27Valerio Virgillito2012-06-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Styles Controller - Fix specificity comparison in hasGreaterSpecificity
| | * | | | | | | | | | | | | | | | Styles Controller - removing console logsEric Guzman2012-06-29
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Styles Controller - Fix specificity comparison in hasGreaterSpecificity()Eric Guzman2012-06-27
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pull request #356 from mencio/google-components-fixesValerio Virgillito2012-06-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | Fix for the youtube component close button on windows
| | * | | | | | | | | | | | | | | | Fix for the youtube component close button on windowsValerio Virgillito2012-06-28
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | | | | | Merge pull request #351 from ananyasen/bugfix-masterValerio Virgillito2012-06-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | fixed IKNINJA-1762 [Copy/Cut on canvas tag tool throws error on console]
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-28
| | |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | fixed IKNINJA-1762 [Copy/Cut on canvas tag tool throws error on console] -> ↵Ananya Sen2012-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-prValerio Virgillito2012-06-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | Timeline: Fix for deselect bug.
| | * | | | | | | | | | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-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_28Valerio Virgillito2012-06-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Presets/CSS Panel - Update css panel with preset class.
| | * | | | | | | | | | | | | | Presets/CSS Panel - Update css panel with preset class.Eric Guzman2012-06-28
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #354 from mencio/IKNINJA-1829Valerio Virgillito2012-06-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the button for the shape pi
| | * | | | | | | | | | | | | | | removing some commentsValerio Virgillito2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | | | | |