| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | 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> | |||
| | * | Give user feedback about which element the Fill/InkBottle tools will act on. | Nivesh Rajbhandari | 2012-04-03 | |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | Presets Controller - Removing test background from transition class | Eric Guzman | 2012-03-27 | |
| | | | ||||
| | * | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-27 | |
| | |\ | ||||
| | * | | Presets Panel - Adding presets controller and removing functionality from ↵ | Eric Guzman | 2012-03-22 | |
| | | | | | | | | | | | | | panel code | |||
| * | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 | |
| |\ \ \ | | |/ | |/| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | Adding firstDraw event to components added | Jose Antonio Marquez | 2012-03-22 | |
| | | | | | | | | | | | | | This will allow us to re-parse the document for styles added dynamically. | |||
| | * | | Adding 'addComponentFirstDraw' event from the user document main component. | Valerio Virgillito | 2012-03-21 | |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | Deleting unecessary property | François Frisch | 2012-03-17 | |
| | | | | ||||
| | * | | Getting ownerComponent bindings | François Frisch | 2012-03-17 | |
| | |/ | ||||
| * / | 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> | |||
| * | Removed css not needed in Ninja Template | Jose Antonio Marquez | 2012-02-22 | |
| | | ||||
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-16 | |
| | | ||||
| * | Moving Ninja iFrame templates | Jose Antonio Marquez | 2012-02-16 | |