| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-07-09 |
| |\ | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Update copyright boilerplate | Kris Kowal | 2012-07-06 |
| | | | |||
| * | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-07-03 |
| |\ \ | |||
| | * \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-07-03 |
| | |\ \ | |||
| | * | | | Timeline: Code refactor for Layer.js | Jon Reid | 2012-07-03 |
| | | | | | |||
| | * | | | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throws | Jon Reid | 2012-07-02 |
| | | | | | | | | | | | | | | | | | error on console. | ||
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-07-03 |
| |\ \ \ \ | | |_|/ | |/| | | |||
| | * | | | adding missing montage to the user library and temporary fix for picas ↵ | Valerio Virgillito | 2012-07-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | screen trash Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Cleanup PropertyTrack.js | Jonathan Duran | 2012-07-03 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | Cleanup Keyframe.js | Jonathan Duran | 2012-07-03 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | Cleanup Tween.js | Jonathan Duran | 2012-07-03 |
| | |_|/ |/| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Cleanup TimelineTrack.js | Jonathan Duran | 2012-07-03 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Fix re-open 3D tweens correctly | Jonathan Duran | 2012-07-03 |
| | |/ |/| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Fix performance bug when moving between nested levels | Jonathan Duran | 2012-07-02 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-07-02 |
| |\ \ | |||
| | * | | Timeline: Bug fix: Unable to reselect a layer with control-click that was | Jon Reid | 2012-06-29 |
| | | | | | | | | | | | | | previously just deselected with control-click. (Yes, that's a weird one.) | ||
| | * | | Timeline: Bug fix: IKNINJA-1857, "Using keyboard shortcut for chrome-preview | Jon Reid | 2012-06-29 |
| | | | | | | | | | | | | | | | | causes each layer in the timeline to remain selected even when clicking on another layer." | ||
| * | | | Fix 3d rotate tweens not showing up | Jonathan Duran | 2012-07-02 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | select keyframe when first created | Jonathan Duran | 2012-07-02 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-07-02 |
| |\ \ \ | | |/ | |/| | |||
| | * | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-29 |
| | |\ \ | |||
| | | * \ | Merge pull request #363 from ericguzman/stylesControllerPatch_6_29 | Valerio Virgillito | 2012-06-29 |
| | | |\ \ | | | | | | | | | | | Styles Controller Patch to ignore unfound rules from getMatchedCSSRules | ||
| | | | * | | Another null check on results from getMatchedCSSRules | Eric Guzman | 2012-06-29 |
| | | | | | | |||
| | | | * | | Null check on results from getMatchedCSSRules | Eric Guzman | 2012-06-29 |
| | | | | | | |||
| | | | * | | Styles Controller - getMatchingRules - Add forgotten return statement | Eric Guzman | 2012-06-29 |
| | | | | | | |||
| | | | * | | Styles controller - adding check for attached element in getMatchedCSSRules | Eric Guzman | 2012-06-29 |
| | | | | | | |||
| | | | * | | Styles Controller Patch to ignore unfound rules from getMatchedCSSRules | Eric Guzman | 2012-06-29 |
| | | | | | | |||
| | * | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-29 |
| | |\| | | | |||
| | * | | | | 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 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||
| | * | | | | | 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/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 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 #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 |
| | | | | | | | |||