| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Timeline: Bug fixes for multiselect | Jon Reid | 2012-05-17 |
| | | |||
| * | Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-local | Jon Reid | 2012-05-17 |
| |\ | |||
| | * | Fix restore tween for main layer track with multiple animation names | Jonathan Duran | 2012-05-16 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Timeline: Multiselect improvements. New convenience methods. Multiselect | Jon Reid | 2012-05-17 |
| | | | | | | | | | drag and drop. | ||
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineProps' into timeline-local | Jon Reid | 2012-05-16 |
| |\| | |||
| | * | methods for setting simple ease and splitting sub prop spans | Jonathan Duran | 2012-05-16 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Remove span highlighting and start syncing pos tracks and main track keyframes | Jonathan Duran | 2012-05-16 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | CSS pixel fix for prop tracks | Jonathan Duran | 2012-05-16 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | remove old method | Jonathan Duran | 2012-05-15 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into ↵ | Jon Reid | 2012-05-15 |
| |\| | | | | | | | timeline-multiselect | ||
| | * | fix keyframe splitting | Jonathan Duran | 2012-05-15 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | remove console logs. add retrieve tweens method for prop tracks | Jonathan Duran | 2012-05-15 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | update stage element on sub prop keyframe select | Jonathan Duran | 2012-05-15 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | fix bug with animation names string not reset on open doc | Jonathan Duran | 2012-05-15 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Timeline: Multiselect from the layer panel. | Jon Reid | 2012-05-15 |
| | | | |||
| * | | Merge branch 'timeline-local' into timeline-multiselect | Jon Reid | 2012-05-15 |
| |\ \ | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers) | ||
| | * | | Timeline: Code cleanup. Improve efficiency for track scrolling. | Jon Reid | 2012-05-15 |
| | |/ | |||
| | * | support width and height tween prop on re-opening saved doc | Jonathan Duran | 2012-05-15 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | handle more prop types in subgroup keyframe rules | Jonathan Duran | 2012-05-14 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | fix keyframe bug when adding keyframes to sub properties | Jonathan Duran | 2012-05-14 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | handle style changes on keyframes | Jonathan Duran | 2012-05-14 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | style keyframe rule addition | Jonathan Duran | 2012-05-14 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Squashed commit of the following: | Jonathan Duran | 2012-05-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit b23502b8ed6856981d09577d4cf24283e5db8afa Author: Kruti Shah <kruti.shah@motorola.com> Date: Mon May 14 10:48:16 2012 -0700 Removed Debugger Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit c0b531a074e9cf9a964da0cda496bba8d7453ec1 Author: Kruti Shah <kruti.shah@motorola.com> Date: Fri May 11 13:55:18 2012 -0700 Changing Doc Layer Name Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | repetition fix | Jonathan Duran | 2012-05-11 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Merge branch 'refs/heads/TimelineUber' into TimelineProps | Jonathan Duran | 2012-05-11 |
| | |\ | |||
| | | * | 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> | ||