aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into dom-containerValerio Virgillito2012-06-11
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge pull request #286 from mqg734/ScrollBarFixValerio Virgillito2012-06-11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into ScrollBarFixNivesh Rajbhandari2012-06-08
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | Removing iframeContainer scroll styles since the scrollbars are not drawn in ...Nivesh Rajbhandari2012-06-08
| | | | * | | | | | | | | | | | | | | | | | | | | | Overriding scrollbar styles on the template so the scroll track is not white....Nivesh Rajbhandari2012-06-08
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #287 from joseeight/FileIOValerio Virgillito2012-06-11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Re-adding temp doc typeJose Antonio Marquez2012-06-09
| | | |/ / / / / / / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | | | | removing console logValerio Virgillito2012-06-11
| | | | | * | | | | | | | | | | | | | | | | | | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | | | |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #285 from joseeight/FileIOValerio Virgillito2012-06-08
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | Remove doc type from files and adding tag check for htmlJose Antonio Marquez2012-06-08
| | | | | |_|/ / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #284 from mencio/timeline-resizer-fixValerio Virgillito2012-06-08
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2Valerio Virgillito2012-06-08
| | | | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into timeline-resizer-fixValerio Virgillito2012-06-08
| | | | |\| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger errorValerio Virgillito2012-06-07
| |