| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-07-09 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Timeline: First pass at cleaning up TimelineTrack code. Changes propagated | Jon Reid | 2012-07-03 |
| | | | | | | | | | to PropertyTrack, TimelineTrack, and Tween classes. | ||
| | * | Timeline: Refactor style and layer to use pointers to parent components. | Jon Reid | 2012-07-03 |
| | | | |||
| | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-07-03 |
| | |\ | |||
| | * | | Timeline: Code refactor for Style.js | Jon Reid | 2012-07-03 |
| | | | | |||
| * | | | 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> | ||
| | * | | adding missing copyright to the feed reader. | Valerio Virgillito | 2012-07-06 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge pull request #373 from kriskowal/bsd | Valerio Virgillito | 2012-07-06 |
| | |\ \ | | | | | | | | | Update copyright boilerplate | ||
| | | * | | 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 |
| | | | | | |||
| | * | | | Merge remote-tracking branch 'origin/timeline-local' into timeline-local | Jon Reid | 2012-07-02 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js use mine; no idea why Git did this. | ||
| | | * | | | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throws | Jon Reid | 2012-07-02 |
| | | | | | | | | | | | | | | | | | | | | | error on console. | ||
| | * | | | | 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> | ||
| | * | | | Merge pull request #369 from aadsm/gh-329_template-creator-restores-element | Valerio Virgillito | 2012-07-03 |
| | |\ \ \ | | | | | | | | | | | gh-329 Make Template Creator restore the elements after serialization | ||
| | | * | | | gh-329 Make Template Creator restore the elements after serialization | António Afonso | 2012-07-03 |
| | |/ / / | | | | | | | | | To create the serialization the element of each component needs to point to a new one, since the code was not restoring these elements the components were left in an undefined state. | ||
| * | | | | 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 |
| |\ \ \ | | |/ | |/| | |||
| | * | | updating to version 7.0 | Valerio Virgillito | 2012-06-29 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge pull request #360 from joseeight/Document | Valerio Virgillito | 2012-06-29 |
| | |\ \ | | | | | | | | | Adding fix to prevent video from playing | ||
| | | * \ | 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 |
| | | | |\ \ | | |_|/ / | |/| | | | |||
| | | | * | | 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). | ||