aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* removed some redundantsAnanya Sen2012-06-21
* Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-21
|\
| * Merge pull request #316 from imix23ways/Timeline-merge-candidateValerio Virgillito2012-06-20
| |\
| | * Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| | |\ | | |/ | |/|
| | * remove bad fileJonathan Duran2012-06-20
| | * Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| | |\
| | | * Merge branch 'refs/heads/timeline-local' into Timeline-merge-candidateJonathan Duran2012-06-20
| | | |\
| | | | * Timeline: Bug fix: Keyframe animation now works with 3D elements.Jon Reid2012-06-20
| | | | * Merge remote-tracking branch 'ninja-internal/master' into timeline-localJon Reid2012-06-20
| | | | |\
| | | | * \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-20
| | | | |\ \
| | | * | \ \ Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | remove old methodJonathan Duran2012-06-20
| | | * | | | remove unneeded filesJonathan Duran2012-06-20
| | | * | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | / | | | | | |/ | | | | |/|
| | * | | | Removed some codeKruti Shah2012-06-20
| | * | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| | |\| | |
| | | * | | remove obsolete functionsJonathan Duran2012-06-19
| | | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-19
| | | |\ \ \
| | | * | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOMJon Reid2012-06-19
| | * | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-19
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | prop tween splittingJonathan Duran2012-06-19
| | | * | | | Lock Position and Size keyframes to main track keyframesJonathan Duran2012-06-19
| | | * | | | Fix position tracks collapser to use unique elementJonathan Duran2012-06-19
| | | |/ / /
| | * | | | LockedElements - LayersKruti Shah2012-06-19
| | * | | | Layer LockKruti Shah2012-06-19
| | * | | | Lock ElementsKruti Shah2012-06-19
| | * | | | Lock ELementsKruti Shah2012-06-19
| | * | | | Locked Elements. Layer ControlsKruti Shah2012-06-19
| | |/ / /
| | * | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-19
| | |\ \ \
| | | * | | Timeline: Enable splitting of keyframes with F6 interaction.Jon Reid2012-06-18
| | | * | | Timeline: Default easing for new animation keyframes set to "none" per CSSJon Reid2012-06-18
| | | * | | Timeline: Bug FixesJon Reid2012-06-18
| | * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-18
| | |\ \ \ \
| | | * | | | Timeline: Bug fix: Document switching no longer causes multiple styles to beJon Reid2012-06-15
| | | * | | | Timeline: Bug fix: Correctly maintain expand/collapse state of layers andJon Reid2012-06-15
| | * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-18
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Timeline: Bug fix: When adding a new keyframe, easing is set to "undefined".Jon Reid2012-06-15
| | * | | | | Timeline: Bug fix IKNINJA 1716, "Ease options are not correctly displayed inJon Reid2012-06-15
| | * | | | | Timeline: fix for IKNINJA-1676, "Timeline: Can't insert a keyframe to a CSSJon Reid2012-06-15
| | * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-15
| | |\ \ \ \ \
| | * | | | | | Timeline: Replace currentSelectedContainer with new model.domContainer.Jon Reid2012-06-15
| | * | | | | | Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
| | |\ \ \ \ \ \
| | * | | | | | | Remove obsolete absolute/relative options from timeline config menuJonathan Duran2012-06-15
| | * | | | | | | Hide timeline zoom slider temporarilyJonathan Duran2012-06-15
| | * | | | | | | remove console logsJonathan Duran2012-06-15
| | * | | | | | | Fix sub prop re-open for tweensJonathan Duran2012-06-15
| | * | | | | | | F6 support for keyframesJonathan Duran2012-06-15
| | * | | | | | | Timeline: fix serialization error.Jon Reid2012-06-14
| | * | | | | | | Merge branch 'new-easing-menu' into timeline-localJon Reid2012-06-14
| | |\ \ \ \ \ \ \