aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'code-cleanup' of https://github.com/mencio/ninja-internal into ...Valerio Virgillito2012-02-09
|\
| * Removing the un-used context menu styleValerio Virgillito2012-02-09
| * deleted old utils file and move single method into NJUtilsValerio Virgillito2012-02-09
| * Removing the un-used package.jsonValerio Virgillito2012-02-09
* | Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into ...Valerio Virgillito2012-02-09
|\ \ | |/ |/|
| * Squashed commit of the following:Jonathan Duran2012-02-09
| * Fix layer/element selection on first click selectJonathan Duran2012-02-09
| * Squashed commit of the following:Jonathan Duran2012-02-09
| * Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-09
| |\
| * | Fixes for animation element assignmentJonathan Duran2012-02-09
| * | CleanupJonathan Duran2012-02-09
| * | Cleaning up more code and adding more models for timelineJonathan Duran2012-02-09
| * | Squashed commit of the following:Jonathan Duran2012-02-08
| * | Display time reading above layers and code clean upJonathan Duran2012-02-08
| * | 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
| |\ \ \
| * | | | Change keyframe to use element mediator when repositioning animated elements ...Jonathan Duran2012-02-06
| * | | | Fix Timeline layer resizer from being inversedJonathan Duran2012-02-06
| * | | | Timeline: add new layers to top of stack instead of bottom.Jonathan Duran2012-02-06
| * | | | Fix problem with resizer set to capture all webkitTransitionEnd events. Updat...Jonathan Duran2012-02-06
| | |/ / | |/| |
| * | | Add back keyframe selection codeJonathan Duran2012-02-06
| * | | Integrate breadcrumb component and layer handling codeJonathan Duran2012-02-06