| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/TimelineUberjd' into TimelineUber | Kruti Shah | 2012-06-12 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | remove unneeded serialization | Jonathan Duran | 2012-06-12 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | montage v10 serialization updates for timeline | Jonathan Duran | 2012-06-12 |
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | remove some console logs and simply the prop tween retrieval conditions | Jonathan Duran | 2012-06-12 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | changes to reopen sub property functions | Jonathan Duran | 2012-06-11 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Fix references to documentController.activeDocument to currentDocument.model | Jonathan Duran | 2012-06-06 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Fix error when opening file with no animations | Jonathan Duran | 2012-06-05 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-05 |
| | |\ | |||
| | | * | Timeline: Bug fixes for deleting styles and their associated tracks | Jon Reid | 2012-05-31 |
| | | | | | | | | | | | | | correctly. | ||
| | * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-05 |
| | |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | document bindings phase 1 | Valerio Virgillito | 2012-05-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Sub property | Kruti Shah | 2012-06-07 |
| |/ / | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@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 | ||
| | | * | 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. | ||
| | * | 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> | ||
| * | | fix to set default prop for tween | Jonathan Duran | 2012-05-29 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-25 |
| |\ \ | |||
| | * | | Timeline: Better fix for keeping styles/tracks in synch when adding styles | Jon Reid | 2012-05-25 |
| | | | | | | | | | | | | | on document open. | ||
| * | | | 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> | ||
| * | | 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 |
| | |\ \ | |||
| | * | | | 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> | ||
| * | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-22 |
| |\| | | | |/ / |/| | | |||
| | * | | 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. | ||
| * | | | | 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> | ||
| * | | CSS pixel fix for prop tracks | Jonathan Duran | 2012-05-16 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | fix keyframe splitting | 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> | ||
| * | | support width and height tween prop on re-opening saved doc | Jonathan Duran | 2012-05-15 |
| | | | | | | | | | 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> | ||
| * | | style keyframe rule addition | Jonathan Duran | 2012-05-14 |
| | | | | | | | | | 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 |
| |\ \ | |||
| | * | | 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: 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> | ||