| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/TimelineUberjd' into TimelineUber | Kruti Shah | 2012-05-31 |
| |\ | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | fix doc model in prop track | Jonathan Duran | 2012-05-31 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-31 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-24 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js | ||
| | | | * | adding document views checks for the timeline and breadcrumb | Valerio Virgillito | 2012-05-23 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | Timeline triggerBinding needs to be set to false in the track data. | Nivesh Rajbhandari | 2012-05-23 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Cleaning up referencing to 'documentRoot' and '_document' | Jose Antonio Marquez | 2012-05-24 |
| | | |/ | | | | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view. | ||
| | | * | Timeline should not select an element when a layer is selected by code. | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | fixing the timeline selecting when creating a new layer | Valerio Virgillito | 2012-05-11 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵ | Valerio Virgillito | 2012-05-10 |
| | | | | | | | | | | | | | | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-30 |
| | |\ \ | |||
| | | * | | fancy keyframe selection | Jonathan Duran | 2012-05-30 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | fix to set default prop for tween | Jonathan Duran | 2012-05-29 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-29 |
| | |\| | | |||
| | | * | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-25 |
| | | |\ \ | |||
| | | * | | | animation name string fix | Jonathan Duran | 2012-05-25 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | remove console logs | Jonathan Duran | 2012-05-25 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | update retrieveStoredTweens method | Jonathan Duran | 2012-05-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change the method to retrieve the keyframe styles for each keyframe generically instead of hard coding for top, left, width and height Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | Timeline: bug fix: better selection/deselection of styles within layers. | Jon Reid | 2012-05-25 |
| | | |/ / | |/| | | |||
| | * | | | Timeline: Better fix for keeping styles/tracks in synch when adding styles | Jon Reid | 2012-05-25 |
| | | | | | | | | | | | | | | | | | on document open. | ||
| | * | | | Timeline: bug fix "Layer name gets doubled" (Spreadsheet) | Jon Reid | 2012-05-24 |
| | | | | | |||
| | * | | | Timeline: Bug fix IKNINJA 1566: Adding a css style property makes the blow | Jon Reid | 2012-05-24 |
| | |/ / | | | | | | | | | | layer name disappear. | ||
| | * | | collapse fix for restored style layers | Jonathan Duran | 2012-05-24 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-24 |
| | |\ \ | |||
| | | * | | Timeline: Easing selection per keyframe. | Jon Reid | 2012-05-23 |
| | | | | | |||
| | | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-23 |
| | | |\ \ | |||
| | | * \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-22 |
| | | |\ \ \ | |||
| | | * | | | | Timeline: New easing selector in spans. | Jon Reid | 2012-05-22 |
| | | | | | | | |||
| | | * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-22 |
| | | |\ \ \ \ | |||
| | * | | | | | | recreating layer props | Jonathan Duran | 2012-05-24 |
| | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | Diamond keyframes | Jonathan Duran | 2012-05-23 |
| | | |_|/ / | |/| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | update ease method to distinguish between main animation and prop animations | Jonathan Duran | 2012-05-22 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-22 |
| | |\| | | | | |/ / | |/| | | |||
| | | * | | Timeline: Code cleanup | Jon Reid | 2012-05-18 |
| | | | | | |||
| | | * | | Timeline: Bug fixes for deleting elements. | Jon Reid | 2012-05-18 |
| | | | | | |||
| | | * | | Timeline: Fix element insertion to use new TimelinePanel properties and | Jon Reid | 2012-05-18 |
| | | | | | | | | | | | | | | | | | | | | | multiselect. Fix Property Panel so changing an ID there will actually change an ID on the element (broken by switch from id to data-montage-id change). | ||
| | | * | | Timeline: More bug fixes and code cleanup for multiselect. | Jon Reid | 2012-05-17 |
| | | | | | |||
| | | * | | 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 |
| | | |\ \ | |||
| | | * | | | 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 |
| | | |\ \ \ | |||
| | | * \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into ↵ | Jon Reid | 2012-05-15 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | timeline-multiselect | ||
| | | * | | | | | 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 |
| | | | | | | | | | |||
| | | * | | | | | | Timeline: Multiselect. | Jon Reid | 2012-04-27 |
| | | | | | | | | | |||
| * | | | | | | | | Style Layer Control | Kruti Shah | 2012-05-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | | | | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUber | Kruti Shah | 2012-05-22 |
| |\| | | | | | | | |||
| | * | | | | | | | more sub prop doc open support | Jonathan Duran | 2012-05-22 |
| | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | Fix restore tween for main layer track with multiple animation names | Jonathan Duran | 2012-05-16 |
| | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||