| 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> | ||
| * | 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 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 | ||
| | | * | | | 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> | ||
| | | * | | CSS Panel - Fix animation duration value updates from "infinite" to integer. | Eric Guzman | 2012-03-29 |
| | | |/ | |||
| | * | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-29 |
| | |\| | |||
| | | * | Merge pull request #145 from ericguzman/PresetsPI | Valerio Virgillito | 2012-03-28 |
| | | |\ | | | | | | | | | Presets - Adding presets controller | ||
| | | * \ | Merge pull request #139 from dhg637/ResizersRefactoring | Valerio Virgillito | 2012-03-28 |
| | | |\ \ | | | | | | | | | | | Resizers refactoring | ||
| | | | * | | Resizers updated | Armen Kesablyan | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | Merge branch 'refs/heads/master' into DataBinding | Armen Kesablyan | 2012-03-22 |
| | | | |\ \ | |||
| | | | * | | | Updated Resizers for Panels and timeline | Armen Kesablyan | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@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 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> | ||
| | * | | | Merge pull request #142 from joseeight/Color | Valerio Virgillito | 2012-03-26 |
| | |\ \ \ | | | | | | | | | | | Color Bug Fix | ||
| | | * | | | Fix: IKNINJA-1362 | Jose Antonio Marquez | 2012-03-26 |
| | | |/ / | |||
| | * | | | Merge pull request #138 from joseeight/FileIO-Montage-Components | Valerio Virgillito | 2012-03-23 |
| | |\ \ \ | | | | | | | | | | | I/O Fixes | ||
| | | * \ \ | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-23 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | | * | | | | 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. | ||
| | * | | | | | Presets - fixed preset group name ("2D") | Eric Guzman | 2012-03-23 |
| | | |/ / / | |/| | | | |||
| | * | | | | Presets Panel - Add slide/fade out animation | Eric Guzman | 2012-03-23 |
| | | | | | | |||
| | * | | | | Adding enabled/disabled support for PI's checkbox control. | Nivesh Rajbhandari | 2012-03-22 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | 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 'refs/heads/master' into montage-integration | Valerio Virgillito | 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 branch 'refs/heads/button-switch' into montage-integration | Valerio Virgillito | 2012-03-20 |
| | |\ \ \ \ | |||
| | | * | | | | fully removing our old button component from Ninja | Valerio Virgillito | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 |
| | |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | montage-integration | ||
| | | * | | | | Maps - Apply default width and height styles to components if specified. ↵ | Nivesh Rajbhandari | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change default location to Sunnyvale. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | looping through both branches of the components tree | Valerio Virgillito | 2012-03-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-19 |
| | |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||
| | * | | | | Youtube video is droppable | François Frisch | 2012-03-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still getting errors with the carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Integrating picasa carousel and youtube channel | François Frisch | 2012-03-17 |
| | | | | | | |||
| | * | | | | adding element creation for the map and feedreader components. | Valerio Virgillito | 2012-03-17 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Adding components to PI | 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> | ||
| * | | | | 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> | ||