aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| | | | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-09
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | Timeline: Bug fixes for keyframe drag and drop.Jon Reid2012-05-09
| | | | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-09
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-09
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | Timeline: Automatic scrolling during dragging of keyframes.Jon Reid2012-05-08
| | | | | * | | | | | | | | | | | | | | | | Timeline: Bug fix: Account for horizontal scroll when dragging keyframes.Jon Reid2012-05-08
| | | | | * | | | | | | | | | | | | | | | | Timeline: Update drag and drop handlers to be unique for drag and drop type.Jon Reid2012-05-08
| | | | | * | | | | | | | | | | | | | | | | Timeline: Move keyframe dragover and drop listeners to TimelinePanel forJon Reid2012-05-07
| | | | * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-09
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Fix a bug in span splitting interaction and remove console logsJonathan Duran2012-05-11
| | | * | | | | | | | | | | | | | | | | | | allow splitting existing spans with new keyframeJonathan Duran2012-05-11
| | | * | | | | | | | | | | | | | | | | | | Timeline: Bug fix: tweens now hide when their container collapses.Jonathan Duran2012-05-10
| | | * | | | | | | | | | | | | | | | | | | Some sub prop updatesJonathan Duran2012-05-10
| | | * | | | | | | | | | | | | | | | | | | sub property additionsJonathan Duran2012-05-09
| | | * | | | | | | | | | | | | | | | | | | Update timeline CSS to allow longer layer labels by defaultJonathan Duran2012-05-08
| | | * | | | | | | | | | | | | | | | | | | Change sub property track arraysJonathan Duran2012-05-08
| | | * | | | | | | | | | | | | | | | | | | more sub prop additionsJonathan Duran2012-05-04
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUber' into TimelinePropsJonathan Duran2012-05-04
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Timeline: True drag-and-drop of keyframesJon Reid2012-05-04
| | | | * | | | | | | | | | | | | | | | | | Timeline: Restore event handler for selectionChange.Jon Reid2012-05-04
| | | | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-05-04
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Timeline: More fixes to selection changing and document switching.Jon Reid2012-05-04
| | | | * | | | | | | | | | | | | | | | | | | Timeline: More work on tween drag-and-dropJon Reid2012-05-03
| | | | * | | | | | | | | | | | | | | | | | | Timeline: Bug fix: Master Duration not updating when all documents areJon Reid2012-05-03
| | | | * | | | | | | | | | | | | | | | | | | Timeline: Initial keyframe drag-and-drop interaction.Jon Reid2012-05-01
| | | | * | | | | | | | | | | | | | | | | | | Timeline: Expand/collapse state of layers now mantained across documentJon Reid2012-05-01
| | | * | | | | | | | | | | | | | | | | | | | property track additions to serialization data objectJonathan Duran2012-05-04
| | | * | | | | | | | | | | | | | | | | | | | Fix subproperty keyframe selectionJonathan Duran2012-05-04
| | | * | | | | | | | | | | | | | | | | | | | update data bindings for subproperty tracksJonathan Duran2012-05-04
| | | * | | | | | | | | | | | | | | | | | | | apply old stash to new branchJonathan Duran2012-05-03
| | | | |/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge pull request #317 from joseeight/ColorValerio Virgillito2012-06-20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #315 from mqg734/IKNinja_1671Valerio Virgillito2012-06-20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | Fix for error when using ZoomTool.Nivesh Rajbhandari2012-06-20
| | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into IKNinja_1671Nivesh Rajbhandari2012-06-20
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated i...Nivesh Rajbhandari2012-06-19
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge pull request #314 from ericmueller/GridValerio Virgillito2012-06-20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gridhwc4872012-06-20
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Added logic to handle grid drawing where grid line starts on an object boundaryhwc4872012-06-19
| | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Adding transparent background to color chip buttonsJose Antonio Marquez2012-06-20
| | | |_|_|_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |