aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Cleanup TimelineTrack.jsJonathan Duran2012-07-03
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix re-open 3D tweens correctlyJonathan Duran2012-07-03
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Fix performance bug when moving between nested levelsJonathan Duran2012-07-02
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-02
|\
| * Timeline: Bug fix: Unable to reselect a layer with control-click that wasJon Reid2012-06-29
| | | | | | | | previously just deselected with control-click. (Yes, that's a weird one.)
| * Timeline: Bug fix: IKNINJA-1857, "Using keyboard shortcut for chrome-previewJon Reid2012-06-29
| | | | | | | | | | causes each layer in the timeline to remain selected even when clicking on another layer."
* | Fix 3d rotate tweens not showing upJonathan Duran2012-07-02
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | select keyframe when first createdJonathan Duran2012-07-02
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-02
|\ \
| * | updating to version 7.0Valerio Virgillito2012-06-29
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge pull request #360 from joseeight/DocumentValerio Virgillito2012-06-29
| |\ \ | | | | | | | | Adding fix to prevent video from playing
| | * \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #363 from ericguzman/stylesControllerPatch_6_29Valerio Virgillito2012-06-29
| |\ \ \ | | | | | | | | | | Styles Controller Patch to ignore unfound rules from getMatchedCSSRules
| | * | | Another null check on results from getMatchedCSSRulesEric Guzman2012-06-29
| | | | |
| | * | | Null check on results from getMatchedCSSRulesEric Guzman2012-06-29
| | | | |
| | * | | Styles Controller - getMatchingRules - Add forgotten return statementEric Guzman2012-06-29
| | | | |
| | * | | Styles controller - adding check for attached element in getMatchedCSSRulesEric Guzman2012-06-29
| | | | |
| | * | | Styles Controller Patch to ignore unfound rules from getMatchedCSSRulesEric Guzman2012-06-29
| | | | |
| | | * | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| | | |\ \ | | |_|/ / | |/| | |
| | | * | Merge pull request #41 from mencio/video-fixJose Antonio Marquez Russo2012-06-29
| | | |\ \ | | | | | | | | | | | | Fixing the video bug
| | | | * | fixing someValerio Virgillito2012-06-29
| | | |/ / | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| | | |\ \
| | | * | | Fixing reference to objectJose Antonio Marquez2012-06-28
| | | | | |
| | | * | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-28
| | | |\ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge pull request #40 from mencio/video-fixJose Antonio Marquez Russo2012-06-28
| | | |\ \ \ | | | | | | | | | | | | | | Video fix cleanup
| | | | * | | video autopsy fix: moving the event handler on creationValerio Virgillito2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | | Merge branch 'refs/heads/Document' into video-fixValerio Virgillito2012-06-28
| | | | |\ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Relocating codeJose Antonio Marquez2012-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 DocumentJose Antonio Marquez2012-06-28
| | | |\ \ \ \
| | | * | | | | Fixing video autoplay bug in PIJose Antonio Marquez2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding functionality to prevent autoplay on videos while in author-time. Fixes chrome preview issues.
| | | * | | | | 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
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |