Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-09 |
|\ | |||
| * | Merge pull request #159 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-04-09 |
| |\ | |||
| | * | Undoing bad auto-merge resize-composer.js. | Nivesh Rajbhandari | 2012-04-05 |
| | * | Undoing some minor spacing differences from auto-merge. | Nivesh Rajbhandari | 2012-04-05 |
| | * | Undoing mistakes from auto-merge. | Nivesh Rajbhandari | 2012-04-05 |
| | * | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-04 |
| | |\ | |||
| | | * | Merge branch 'refs/heads/WebGLFileIO' into ToolFixes | Nivesh Rajbhandari | 2012-04-04 |
| | | |\ | |||
| | | | * | 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 |
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 |
| | |\ \ \ \ | |||
| | * | | | | | Adding logic for flatten checkbox in PI. | Nivesh Rajbhandari | 2012-03-24 |
| | * | | | | | Tweaking some styles in the materials popup. | Nivesh Rajbhandari | 2012-03-23 |
| | * | | | | | IKNINJA-758 - The rotation value of the stage is not updated in the propertie... | Nivesh Rajbhandari | 2012-03-22 |
* | | | | | | | 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 |
| * | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-04-04 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||
| * | | | | | | completing the component simple pi | Valerio Virgillito | 2012-03-30 |
| * | | | | | | IKNINJA-1191 - Fixed the order of the components | Valerio Virgillito | 2012-03-30 |
| * | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-03-28 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||
| * | | | | | | Cleanup of the components panel | Valerio Virgillito | 2012-03-26 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | 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 |
| |\ \ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'refs/heads/master' into BugFixes | Armen Kesablyan | 2012-04-04 |
| | |\ \ \ \ \ | |||
| | * | | | | | | Resizing Bugs | Armen Kesablyan | 2012-03-29 |
| | * | | | | | | Bug #1073: Panels interact with hottest drag drop | Armen Kesablyan | 2012-03-28 |
| | | |_|/ / / | | |/| | | | | |||
| * | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-04-04 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||
| * | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-29 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||
| * | | | | | | Presets - Remove style transition when transition doesn't start. Also added t... | Eric Guzman | 2012-03-29 |
* | | | | | | | 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 |
| | |_|_|_|/ | |/| | | | | |||
* | | | | | | 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 |
| |\| | | | |||
| | * | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-27 |
| | |\| | | |||
| | * | | | Presets Panel - Adding presets controller and removing functionality from pan... | Eric Guzman | 2012-03-22 |
| | | |/ | | |/| | |||
| * | | | Merge pull request #139 from dhg637/ResizersRefactoring | Valerio Virgillito | 2012-03-28 |
| |\ \ \ | | |_|/ | |/| | | |||
| | * | | Resizers updated | Armen Kesablyan | 2012-03-23 |
| | * | | Merge branch 'refs/heads/master' into DataBinding | Armen Kesablyan | 2012-03-22 |
| | |\| | |||
| | * | | Updated Resizers for Panels and timeline | Armen Kesablyan | 2012-03-22 |
| * | | | Merge pull request #142 from joseeight/Color | Valerio Virgillito | 2012-03-26 |
| |\ \ \ | |||
| | * | | | Fix: IKNINJA-1362 | Jose Antonio Marquez | 2012-03-26 |
| | | |/ | | |/| | |||
| * | | | Merge pull request #138 from joseeight/FileIO-Montage-Components | Valerio Virgillito | 2012-03-23 |
| |\ \ \ | |||
| | * \ \ | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo... | Jose Antonio Marquez | 2012-03-23 |
| | |\ \ \ |