aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-03
|\
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-03
| |\
| * | Timeline: Code refactor for Layer.jsJon Reid2012-07-03
| * | Merge remote-tracking branch 'origin/timeline-local' into timeline-localJon Reid2012-07-02
| |\ \
| | * | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throwsJon Reid2012-07-02
| * | | Timeline: Bug fix IKNINJA-1792, Cut pasting multiple selected objects throwsJon Reid2012-07-02
| |/ /
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-03
|\ \ \
| * | | adding missing montage to the user library and temporary fix for picas screen...Valerio Virgillito2012-07-03
| * | | Merge pull request #369 from aadsm/gh-329_template-creator-restores-elementValerio Virgillito2012-07-03
| |\ \ \
| | * | | gh-329 Make Template Creator restore the elements after serializationAntónio Afonso2012-07-03
| |/ / /
* | | | Cleanup PropertyTrack.jsJonathan Duran2012-07-03
* | | | Cleanup Keyframe.jsJonathan Duran2012-07-03
* | | | Cleanup Tween.jsJonathan Duran2012-07-03
| |_|/ |/| |
* | | Cleanup TimelineTrack.jsJonathan Duran2012-07-03
* | | Fix re-open 3D tweens correctlyJonathan Duran2012-07-03
| |/ |/|
* | Fix performance bug when moving between nested levelsJonathan Duran2012-07-02
* | 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
| * | Timeline: Bug fix: IKNINJA-1857, "Using keyboard shortcut for chrome-previewJon Reid2012-06-29
* | | Fix 3d rotate tweens not showing upJonathan Duran2012-07-02
* | | select keyframe when first createdJonathan Duran2012-07-02
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-07-02
|\ \ \ | | |/ | |/|
| * | updating to version 7.0Valerio Virgillito2012-06-29
| * | Merge pull request #360 from joseeight/DocumentValerio Virgillito2012-06-29
| |\ \
| | * \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #363 from ericguzman/stylesControllerPatch_6_29Valerio Virgillito2012-06-29
| |\ \ \
| | * | | 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 someValerio Virgillito2012-06-29
| | | |/ /
| | | * | 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 autopsy fix: moving the event handler on creationValerio Virgillito2012-06-28
| | | | * | | Merge branch 'refs/heads/Document' into video-fixValerio Virgillito2012-06-28
| | | | |\ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Relocating codeJose Antonio Marquez2012-06-28
| | | * | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-28
| | | |\ \ \ \
| | | * | | | | Fixing video autoplay bug in PIJose Antonio Marquez2012-06-28
| | | * | | | | Preventing video playback on openJose 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-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
| | | |\ \ \ \ \ \ \ \ \ \