aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Timeline_updated' into TimelineJonathan Duran2012-02-08
|\
| * Numbering of layers between different selectedContainers starts from 1Kruti Shah2012-02-08
| * Merge branch 'refs/heads/Timeline' into Timeline_updatedKruti Shah2012-02-08
| |\
| * \ Merge branch 'refs/heads/Timeline' into Timeline_updatedKruti Shah2012-02-08
| |\ \
* | | | Squashed commit of the following:Jonathan Duran2012-02-08
* | | | Squashed commit of the following:Jonathan Duran2012-02-08
* | | | Make Stage work after live previewJonathan Duran2012-02-08
* | | | Squashed commit of the following:Jonathan Duran2012-02-08
* | | | Squashed commit of the following:Jonathan Duran2012-02-08
| |_|/ |/| |
* | | Merge branch 'refs/heads/Timeline-jreid' into TimelineJonathan Duran2012-02-08
|\ \ \
| * | | Timeline: restore method incorrectly removed in last commit.Jon Reid2012-02-08
* | | | Keyframe and span style updates and change time marker timesJonathan Duran2012-02-08
|/ / /
* | | Timeline: Feature: select first layer by default. Bug fix: Remove left panel ...Jon Reid2012-02-08
* | | Merge branch 'Timeline-jduran' into Timeline-jreidJon Reid2012-02-08
|\ \ \ | | |/ | |/|
| * | Merge branch 'refs/heads/Timeline_updated' into TimelineJonathan Duran2012-02-08
| |\|
| | * Timeline : Adding functionality to unable deletion when a single layer remain...Kruti Shah2012-02-07
| | * Timeline : Layers & DOM enchancementKruti Shah2012-02-07
| | * Timeline : Change in the Hooking up of DOM/LayersKruti Shah2012-02-06
| * | Layer Undo enhancementsJonathan Duran2012-02-07
| * | Add Span color highlight for animated spans and restyle keyframesJonathan Duran2012-02-07
* | | Timeline: Comment updates.Jon Reid2012-02-07
* | | Timeline: Finish focus/blur for left side of panel. Add new methods selectLa...Jon Reid2012-02-07
* | | Timeline: select/deselect layers. Work on focus/blur for layers.Jon Reid2012-02-07
* | | Timeline: fix linked scrolling between tracks and layers (vertical) and track...Jon Reid2012-02-07
|/ /
* | Hookup track animations to layer elementJonathan Duran2012-02-07
* | Fix timeline time markersJonathan Duran2012-02-07
* | Change DOM/layer handling workflowJonathan Duran2012-02-07
* | Fix resized going off screen by giving layer gutter a max width of 500Jonathan Duran2012-02-06
* | Fix Timeline height so it appears correctly on loadJonathan Duran2012-02-06
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tim...Jonathan Duran2012-02-06
|\ \
| * \ Merge pull request #18 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-06
| |\ \
| | * \ Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-06
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #17 from joseeight/SnapFixValerio Virgillito2012-02-06
| |\ \ \
| | * | | Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| |/ / /
| * | | Merge pull request #16 from ericguzman/TreeComponentsValerio Virgillito2012-02-06
| |\ \ \
| | * | | TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | * | | Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | * | | Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | * | | Tree Controller - Initial addEric Guzman2012-02-06
| | | * | Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| | | * | TreeController - moving the tree controller to the components directoryEric Guzman2012-02-06
| | | * | Tree Components - Adding the tree componentsEric Guzman2012-02-06
| | | * | Tree Controller - Clean out unused codeEric Guzman2012-02-06
| | | * | Tree Controller - Initial addEric Guzman2012-02-06
| | | * | Styles Controller - Add some methods for modifying css keyframe rulesEric Guzman2012-02-06
| | | * | Styles Controller - Correct author attribution for specificity calculationEric Guzman2012-02-06
| | | * | Styles Controller - Add code to remove cache items from history (not just nul...Eric Guzman2012-02-06
| | | * | Styles Controller - First stab at group stylingEric Guzman2012-02-06
| | |/ / | |/| |
* | | | Change keyframe to use element mediator when repositioning animated elements ...Jonathan Duran2012-02-06
* | | | Fix Timeline layer resizer from being inversedJonathan Duran2012-02-06