| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Undoing some minor spacing differences from auto-merge. | Nivesh Rajbhandari | 2012-04-05 |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Merge branch 'refs/heads/WebGLFileIO' into ToolFixes | Nivesh Rajbhandari | 2012-04-04 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js 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 Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | merge from main | hwc487 | 2012-03-29 |
| | | | |||
| * | | 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 Panel - Adding presets controller and removing functionality from ↵ | Eric Guzman | 2012-03-22 |
| | | | | | panel code | ||
| * | Presets - Modify application of preset classes for new json structure | Eric Guzman | 2012-02-15 |
| | | |||
| * | Presets Panel - Initial commit with panel content | Eric Guzman | 2012-02-07 |