Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-04 |
|\ | | | | | | | | | | | | | | | | | Snapping Conflicts: js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js | ||
| * | Presets - Remove style transition when transition doesn't start. Also added ↵ | Eric Guzman | 2012-03-29 |
| | | | | | | | | temporary fix for aggregating animations (from timeline/presets) | ||
* | | merge from main | hwc487 | 2012-03-29 |
|/ | |||
* | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-27 |
|\ | |||
| * | Presets - fixed preset group name ("2D") | Eric Guzman | 2012-03-23 |
| | | |||
| * | Presets Panel - Add slide/fade out animation | Eric Guzman | 2012-03-23 |
| | | |||
| * | Presets - Animation update | Eric Guzman | 2012-03-20 |
| | | |||
* | | Presets Panel - Adding presets controller and removing functionality from ↵ | Eric Guzman | 2012-03-22 |
|/ | | | | panel code | ||
* | Presets Panel - Adding Animations Tab | Eric Guzman | 2012-03-16 |