| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | CSS Panel - Add editing and adding new styles in declaration and style | Eric Guzman | 2012-04-23 |
| | | |||
| * | CSS Panel - Add stub for resizer | Eric Guzman | 2012-04-23 |
| | | |||
| * | CSS Panel - Add drag and drop UI | Eric Guzman | 2012-04-13 |
| | | |||
| * | CSS Style Rule - Show appropriate "sheet name" for inline style | Eric Guzman | 2012-04-13 |
| | | |||
| * | CSS Rule List - Add inline style to supported rule types | Eric Guzman | 2012-04-13 |
| | | |||
| * | CSS Rule List - Add inline style to rule list | Eric Guzman | 2012-04-13 |
| | | |||
| * | CSS Style Rule - Make selector editable | Eric Guzman | 2012-04-12 |
| | | |||
| * | CSS Style - Make draggable | Eric Guzman | 2012-04-12 |
| | | |||
| * | CSS Style - Add disabled UI state. Added Hintable and editable UI state. | Eric Guzman | 2012-04-11 |
| | | |||
| * | CSS Rule List - Enabled list switching on selection | Eric Guzman | 2012-04-11 |
| | | |||
| * | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-09 |
| |\ | |||
| | * | Merge pull request #159 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-04-09 |
| | |\ | | | | | | | 3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes. | ||
| | | * | Undoing bad auto-merge resize-composer.js. | Nivesh Rajbhandari | 2012-04-05 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Undoing some minor spacing differences from auto-merge. | Nivesh Rajbhandari | 2012-04-05 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Undoing mistakes from auto-merge. | Nivesh Rajbhandari | 2012-04-05 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-04 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js 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 branch 'refs/heads/EricSnapping' into WebGLFileIO | Nivesh Rajbhandari | 2012-04-04 |
| | | | | |\ | |||
| | | | | | * | merge from main | hwc487 | 2012-03-29 |
| | | | | | | | |||
| | | | * | | | Styling PI's Materials edit button. | Nivesh Rajbhandari | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | Adding logic for flatten checkbox in PI. | Nivesh Rajbhandari | 2012-03-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires minor modifications to both StageController and ComponentController. Also removing unused global3DSettings CSS. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | Tweaking some styles in the materials popup. | Nivesh Rajbhandari | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | IKNINJA-758 - The rotation value of the stage is not updated in the ↵ | Nivesh Rajbhandari | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properties panel. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | Style sheet - Style update | Eric Guzman | 2012-04-09 |
| | | | | | | | | |||
| * | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-05 |
| |\| | | | | | | |||
| | * | | | | | | fixing the number fields to not have units. | Valerio Virgillito | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||
| | * | | | | | | completing the component simple pi | Valerio Virgillito | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | IKNINJA-1191 - Fixed the order of the components | Valerio Virgillito | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Components now appear in alphabetical order. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-03-28 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||
| | * | | | | | | Cleanup of the components panel | Valerio Virgillito | 2012-03-26 |
| | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed to naming convention. Deleted un-used file. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | Style Sheets - More CSS tweaks | Eric Guzman | 2012-04-05 |
| | | | | | | | |||
| * | | | | | | Style Sheets - Style update for edit view | Eric Guzman | 2012-04-05 |
| | | | | | | | |||
| * | | | | | | Rule List - Update selection to not use "_element" property. | Eric Guzman | 2012-04-04 |
| | | | | | | | |||
| * | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-04 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| | * | | | | | Merge pull request #149 from dhg637/BugFixes | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Bug fixes | ||
| | | * \ \ \ \ | Merge branch 'refs/heads/master' into BugFixes | Armen Kesablyan | 2012-04-04 |
| | | |\ \ \ \ \ | |||
| | | * | | | | | | Resizing Bugs | Armen Kesablyan | 2012-03-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | Bug #1073: Panels interact with hottest drag drop | Armen Kesablyan | 2012-03-28 |
| | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-04-04 |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/presets-controller.js | ||
| | * | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-29 |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | * | | | | | | 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 CSSPanelUpdates | Eric Guzman | 2012-04-04 |
| |\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | * | | | | | | 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> | ||
| * | | | | | | Style sheets section - Edit mode css tweaks and buttons | Eric Guzman | 2012-04-04 |
| | | | | | | | |||
| * | | | | | | CSS Panel - Stylesheet edit mode | Eric Guzman | 2012-04-03 |
| | | | | | | | |||
| * | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-02 |
| |\| | | | | | |||
| | * | | | | | CSS Panel - Fix animation duration value updates from "infinite" to integer. | Eric Guzman | 2012-03-29 |
| | | |/ / / | |/| | | | |||
| | * | | | | Merge pull request #145 from ericguzman/PresetsPI | Valerio Virgillito | 2012-03-28 |
| | |\| | | | | | | | | | | | | | Presets - Adding presets controller | ||