| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-11 | |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||
| | | * | | | | Removing obsolete treeList reference in preset templates. | Nivesh Rajbhandari | 2012-05-11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | Removing outdated tree-controller. | Nivesh Rajbhandari | 2012-05-11 | |
| | | | |/ / | | |/| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | Timeline: Bug fixes for keyframe drag and drop. | Jon Reid | 2012-05-09 | |
| | | | | | | ||||
| | * | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-09 | |
| | |\ \ \ \ | ||||
| | | * | | | | Timeline: Automatic scrolling during dragging of keyframes. | Jon Reid | 2012-05-08 | |
| | | | | | | | ||||
| | | * | | | | Timeline: Bug fix: Account for horizontal scroll when dragging keyframes. | Jon Reid | 2012-05-08 | |
| | | | | | | | ||||
| | | * | | | | Timeline: Update drag and drop handlers to be unique for drag and drop type. | Jon Reid | 2012-05-08 | |
| | | | | | | | ||||
| | | * | | | | Timeline: Move keyframe dragover and drop listeners to TimelinePanel for | Jon Reid | 2012-05-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | interaction improvements. | |||
| | * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-09 | |
| | |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | Fixing the color popup | Valerio Virgillito | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | temporary commenting a timeline bug preventing nested selection | Valerio Virgillito | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id | Valerio Virgillito | 2012-05-03 | |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | | * \ \ | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 | |
| | | | |\ \ \ | ||||
| | | | * \ \ \ | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 | |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | | * | | | | | Refactor creating elements. Removed makeNJElement and separated the model ↵ | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | | * | | | | | code cleanup | Valerio Virgillito | 2012-05-02 | |
| | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | Removing unused components references | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | Fixing the lock button css | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | finishing to replace all id with data-montage-id | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 | |
| | | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | ||||
| | | * | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 | |
| | | |\ \ \ \ \ | ||||
| | | * \ \ \ \ \ | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-id | Valerio Virgillito | 2012-05-03 | |
| | | |\ \ \ \ \ \ | ||||
| | | | * | | | | | | Changing ID to Montage-ID for Color Panel | Jose Antonio Marquez | 2012-05-03 | |
| | | | | |_|/ / / | | | |/| | | | | ||||
| | | * / | | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵ | Nivesh Rajbhandari | 2012-04-30 | |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | | | Fix a bug in span splitting interaction and remove console logs | Jonathan Duran | 2012-05-11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | | | allow splitting existing spans with new keyframe | Jonathan Duran | 2012-05-11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | | | Timeline: Bug fix: tweens now hide when their container collapses. | Jonathan Duran | 2012-05-10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | | | Some sub prop updates | Jonathan Duran | 2012-05-10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | | | sub property additions | Jonathan Duran | 2012-05-09 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | | | Update timeline CSS to allow longer layer labels by default | Jonathan Duran | 2012-05-08 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | | | Change sub property track arrays | Jonathan Duran | 2012-05-08 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove transform section and move width and height into Position section. rename position section Position and Size. additional support for generic prop tweens Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | | | more sub prop additions | Jonathan Duran | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | | | Merge branch 'refs/heads/TimelineUber' into TimelineProps | Jonathan Duran | 2012-05-04 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | Timeline: True drag-and-drop of keyframes | Jon Reid | 2012-05-04 | |
| | | | | | | | | ||||
| | * | | | | | | Timeline: Restore event handler for selectionChange. | Jon Reid | 2012-05-04 | |
| | | | | | | | | ||||
| | * | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-04 | |
| | |\ \ \ \ \ \ | ||||
| | | * | | | | | | Timeline: More fixes to selection changing and document switching. | Jon Reid | 2012-05-04 | |
| | | | |_|/ / / | | |/| | | | | ||||
| | * | | | | | | Timeline: More work on tween drag-and-drop | Jon Reid | 2012-05-03 | |
| | | | | | | | | ||||
| | * | | | | | | Timeline: Bug fix: Master Duration not updating when all documents are | Jon Reid | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closed. | |||
| | * | | | | | | Timeline: Initial keyframe drag-and-drop interaction. | Jon Reid | 2012-05-01 | |
| | | | | | | | | ||||
| | * | | | | | | Timeline: Expand/collapse state of layers now mantained across document | Jon Reid | 2012-05-01 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switching. | |||
| * | | | | | | | property track additions to serialization data object | Jonathan Duran | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | | | Fix subproperty keyframe selection | Jonathan Duran | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | | | update data bindings for subproperty tracks | Jonathan Duran | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | | | apply old stash to new branch | Jonathan Duran | 2012-05-03 | |
| | |/ / / / / | | ||||