Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ↵ | Valerio Virgillito | 2012-04-26 |
|\ | | | | | | | serialization | ||
| * | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 |
| | | | | | | | | preparation for montage converting to the new "prototype" format fully | ||
* | | We don't currently support perspective values on individual elements, so ↵ | Nivesh Rajbhandari | 2012-04-26 |
|/ | | | | | | removing perspective values from the animation presets. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-04-04 |
|\ | | | | | | | | | Conflicts: js/controllers/presets-controller.js | ||
| * | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | 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 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 |
| | | |||
| * | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-21 |
| |\ | | | | | | | | | | montage-integration | ||
| | * | Presets Panel - Add Font style preset | Eric Guzman | 2012-03-21 |
| | | | |||
| * | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 |
| |\| | | | | | | | | | | montage-integration | ||
| | * | Presets - Animation update | Eric Guzman | 2012-03-20 |
| | | | |||
| | * | Merge pull request #124 from ericguzman/AddAnimationsLibrary | Valerio Virgillito | 2012-03-16 |
| | |\ | | | | | | | | | Presets Panel - Adding Animations Tab | ||
| | * | | Presets Panel: Added Scale Up and Down to transitions list. According to eric G. | Armen Kesablyan | 2012-03-15 |
| | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
* | | | | Presets Panel - Adding presets controller and removing functionality from ↵ | Eric Guzman | 2012-03-22 |
|/ / / | | | | | | | | | | panel code | ||
* | | | Presets Panel - Fix conflict with default transition presets | Eric Guzman | 2012-03-17 |
| | | | |||
* | | | Presets Panel - Change Tab labels, Add Un-3d preset | Eric Guzman | 2012-03-16 |
| |/ |/| | |||
* | | Presets Panel - Adding Animations Tab | Eric Guzman | 2012-03-16 |
|/ | |||
* | Presets Panel - Re-add dbl-click activation | Eric Guzman | 2012-03-13 |
| | |||
* | Presets Panel - Adding single-click activation | Eric Guzman | 2012-03-13 |
| | |||
* | Presets Panel - Adding hover state to ninja-leaf | Eric Guzman | 2012-03-13 |
| | |||
* | Presets Panel - Fix single-click activation, and transition cut-off bug. | Eric Guzman | 2012-03-02 |
| | | | | Use double-click as the activation event for transition presets. Also fixed the bug when applying a style preset before the transition preset, which disabled transitions after the first one. | ||
* | prefixing the local storage and using the new local-storage object. | Valerio Virgillito | 2012-02-24 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Adding some missing copyrights | Valerio Virgillito | 2012-02-24 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Presets - Minor CSS text-shadow work-around for Windows Chrome | Eric Guzman | 2012-02-16 |
| | |||
* | Presets - Get/set active tab from local storage + other improvements | Eric Guzman | 2012-02-15 |
| | |||
* | Presets - Modify application of preset classes for new json structure | Eric Guzman | 2012-02-15 |
| | |||
* | Presets - Modify structure of preset data | Eric Guzman | 2012-02-15 |
| | |||
* | Presets - Add external json file with transition data | Eric Guzman | 2012-02-15 |
| | |||
* | Style Presets - Separate out the style preset data to new file | Eric Guzman | 2012-02-13 |
| | |||
* | Presets - Committing half-baked drag and drop | Eric Guzman | 2012-02-13 |
| | |||
* | Presets - fixed some object naming and css for presets tree | Eric Guzman | 2012-02-08 |
| | |||
* | Presets Panel - Initial commit with panel content | Eric Guzman | 2012-02-07 |