aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Timeline: New easing menu.Jon Reid2012-06-14
| | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into new-easing-menuJon Reid2012-06-14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Timeline: More work on new easing menu.Jon Reid2012-06-13
| | * | | | | | | | | | | | | | | | | | | Timeline: New popup menu for easing choices.Jon Reid2012-06-12
| * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-06-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge pull request #1 from ntfx47/TimelineUberJonathan Duran2012-06-13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Fix the broken animationKruti Shah2012-06-12
| | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-12
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Clean upKruti Shah2012-06-12
| | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | remove unneeded serializationJonathan Duran2012-06-12
| | | * | | | | | | | | | | | | | | | | | montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | * | | | | | | | | | | | | | | | | | remove some console logs and simply the prop tween retrieval conditionsJonathan Duran2012-06-12
| | | * | | | | | | | | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-06-11
| | | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | changes to reopen sub property functionsJonathan Duran2012-06-11
| | * | | | | | | | | | | | | | | | | | | Sub PropsKruti Shah2012-06-12
| | * | | | | | | | | | | | | | | | | | | Color chip in TPKruti Shah2012-06-08
| | * | | | | | | | | | | | | | | | | | | Sub propertyKruti Shah2012-06-07
| | * | | | | | | | | | | | | | | | | | | LCKruti Shah2012-06-04
| | * | | | | | | | | | | | | | | | | | | LayerControlKruti Shah2012-06-01
| | * | | | | | | | | | | | | | | | | | | Clean upKruti Shah2012-06-01
| | * | | | | | | | | | | | | | | | | | | Layer ControlsKruti Shah2012-06-01
| | * | | | | | | | | | | | | | | | | | | Color ChipKruti Shah2012-05-31
| | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-05-31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | Style Layer ControlKruti Shah2012-05-22
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-05-22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Layer ControlKruti Shah2012-05-22
| * | | | | | | | | | | | | | | | | | | | | | Timeline: New feature: Only one easing menu can be open at a time.Jon Reid2012-06-08
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |