Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/Timeline' into Timeline_updated | Kruti Shah | 2012-02-08 |
|\ | |||
| * | Merge branch 'refs/heads/Timeline-jreid' into Timeline | Jonathan Duran | 2012-02-08 |
| |\ | |||
| | * | Timeline: restore method incorrectly removed in last commit. | Jon Reid | 2012-02-08 |
| | | | |||
| * | | Keyframe and span style updates and change time marker times | Jonathan Duran | 2012-02-08 |
| |/ | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Timeline: Feature: select first layer by default. Bug fix: Remove left panel ↵ | Jon Reid | 2012-02-08 |
| | | | | | | | | blur; we should never have a situation where no layers are selected. | ||
| * | Merge branch 'Timeline-jduran' into Timeline-jreid | Jon Reid | 2012-02-08 |
| |\ | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | ||
| * | | Timeline: Comment updates. | Jon Reid | 2012-02-07 |
| | | | |||
| * | | Timeline: Finish focus/blur for left side of panel. Add new methods ↵ | Jon Reid | 2012-02-07 |
| | | | | | | | | | | | | selectLayer, getLayerIndexByID and getLayerIndexByName. | ||
| * | | Timeline: select/deselect layers. Work on focus/blur for layers. | Jon Reid | 2012-02-07 |
| | | | |||
| * | | Timeline: fix linked scrolling between tracks and layers (vertical) and ↵ | Jon Reid | 2012-02-07 |
| | | | | | | | | | | | | tracks and time markers (horizontal). | ||
* | | | Merge branch 'refs/heads/Timeline' into Timeline_updated | Kruti Shah | 2012-02-08 |
|\ \ \ | | |/ | |/| | |||
| * | | Merge branch 'refs/heads/Timeline_updated' into Timeline | Jonathan Duran | 2012-02-08 |
| |\ \ | |/ / |/| | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | | Timeline : Adding functionality to unable deletion when a single layer ↵ | Kruti Shah | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | remaining & when track is animated Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
* | | | Timeline : Layers & DOM enchancement | Kruti Shah | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Undo & Redo of Layers within same container - Undo & Redo of Layers between different containers - Adding the element on the layer selected else default is the last layer drawn Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
* | | | Timeline : Change in the Hooking up of DOM/Layers | Kruti Shah | 2012-02-06 |
| | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | Layer Undo enhancements | Jonathan Duran | 2012-02-07 |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Add Span color highlight for animated spans and restyle keyframes | Jonathan Duran | 2012-02-07 |
| |/ | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Hookup track animations to layer element | Jonathan Duran | 2012-02-07 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Fix timeline time markers | Jonathan Duran | 2012-02-07 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Change DOM/layer handling workflow | Jonathan Duran | 2012-02-07 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Fix resized going off screen by giving layer gutter a max width of 500 | Jonathan Duran | 2012-02-06 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Fix Timeline height so it appears correctly on load | Jonathan Duran | 2012-02-06 |
| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Jonathan Duran | 2012-02-06 |
| |\ | | | | | | | | | | Timeline | ||
| | * | Merge pull request #18 from ericguzman/StylesControllerUpdates | Valerio Virgillito | 2012-02-06 |
| | |\ | | | | | | | | | Styles controller updates | ||
| | | * | Merge branch 'refs/heads/master' into StylesControllerUpdates | Eric Guzman | 2012-02-06 |
| | | |\ | | | |/ | | |/| | |||
| | * | | Merge pull request #17 from joseeight/SnapFix | Valerio Virgillito | 2012-02-06 |
| | |\ \ | | | | | | | | | | | Attempt to fix initialization bug for snap-manager | ||
| | | * | | Attempt to fix initialization bug for snap-manager | Jose Antonio Marquez | 2012-02-06 |
| | |/ / | |||
| | * | | Merge pull request #16 from ericguzman/TreeComponents | Valerio Virgillito | 2012-02-06 |
| | |\ \ | | | | | | | | | | | Tree components | ||
| | | * | | TreeController - moving the tree controller to the components directory | Eric Guzman | 2012-02-06 |
| | | | | | |||
| | | * | | Tree Components - Adding the tree components | Eric Guzman | 2012-02-06 |
| | | | | | |||
| | | * | | Tree Controller - Clean out unused code | Eric Guzman | 2012-02-06 |
| | | | | | |||
| | | * | | Tree Controller - Initial add | Eric Guzman | 2012-02-06 |
| | | | | | |||
| | | | * | Attempt to fix initialization bug for snap-manager | Jose Antonio Marquez | 2012-02-06 |
| | | | | | |||
| | | | * | TreeController - moving the tree controller to the components directory | Eric Guzman | 2012-02-06 |
| | | | | | |||
| | | | * | Tree Components - Adding the tree components | Eric Guzman | 2012-02-06 |
| | | | | | |||
| | | | * | Tree Controller - Clean out unused code | Eric Guzman | 2012-02-06 |
| | | | | | |||
| | | | * | Tree Controller - Initial add | Eric Guzman | 2012-02-06 |
| | | | | | |||
| | | | * | Styles Controller - Add some methods for modifying css keyframe rules | Eric Guzman | 2012-02-06 |
| | | | | | |||
| | | | * | Styles Controller - Correct author attribution for specificity calculation | Eric Guzman | 2012-02-06 |
| | | | | | |||
| | | | * | Styles Controller - Add code to remove cache items from history (not just ↵ | Eric Guzman | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | | nullifying them) | ||
| | | | * | Styles Controller - First stab at group styling | Eric Guzman | 2012-02-06 |
| | | |/ | | |/| | | | | | | | | | Split "createOverrideRule" into two methods --> now has createOverrideSelector. Also took first stab at creating a group style. | ||
| * | | | Change keyframe to use element mediator when repositioning animated elements ↵ | Jonathan Duran | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | on stage Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Fix Timeline layer resizer from being inversed | Jonathan Duran | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | layer resizer now works in the correct direction when dragging Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Timeline: add new layers to top of stack instead of bottom. | Jonathan Duran | 2012-02-06 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Fix problem with resizer set to capture all webkitTransitionEnd events. ↵ | Jonathan Duran | 2012-02-06 |
|/ / / | | | | | | | | | | | | | | | | Update collapser to use namespaced webkitTransitionEnd events for forward compatibility. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | | Add back keyframe selection code | Jonathan Duran | 2012-02-06 |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | | Integrate breadcrumb component and layer handling code | Jonathan Duran | 2012-02-06 |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | | CSS for timeline | Jonathan Duran | 2012-02-06 |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | | style controller update for CSS animations | Jonathan Duran | 2012-02-06 |
| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
* | | | merge new timeline | Jonathan Duran | 2012-02-06 |
|/ / | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> |