| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-04 |
| |\ | |||
| | * | Merge pull request #154 from mqg734/ToolFixes | Valerio Virgillito | 2012-04-04 |
| | |\ | | | | | | | Need to set elementModel.isIn2DSnapCache flag to false when removing element from SnapManager's cache. | ||
| | | * | Need to set elementModel.isIn2DSnapCache flag to false when removing element ↵ | Nivesh Rajbhandari | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | from SnapManager's cache. 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 |
| | | |\| | |||
| | | * | | Bug Fix: Height and width of panels not be kept | Armen Kesablyan | 2012-03-29 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | 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 | ||
| | * | | | Animation Presets - Only combine animations if pre-existing animations exist | Eric Guzman | 2012-04-02 |
| | | | | | |||
| | * | | | Presets Controller - Remove unused method call | Eric Guzman | 2012-03-30 |
| | | | | | |||
| | * | | | 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 |
| |\| | | | | |||
| | * | | | | Merge pull request #148 from ananyasen/integration-candidate | Valerio Virgillito | 2012-04-01 |
| | |\ \ \ \ | | | | | | | | | | | | | added text paste detection and updated some menu items | ||
| | | * | | | | - using clipboard data directly to avoid using setTimeout | Ananya Sen | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed logical error to trigger OK on Enter key pressed Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | detect paste from context menu for new file and save as dialog | Ananya Sen | 2012-03-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | IKNINJA-719 - removed Zoom In/Zoom Out under View menu in the Main menu | Ananya Sen | 2012-03-28 |
| | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | Disabled cut, copy, paste, debug, since that functionality is not there yet Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | CSS Panel - Fix animation duration value updates from "infinite" to integer. | Eric Guzman | 2012-03-29 |
| | | |_|/ | |/| | | |||
| | * | | | Merge pull request #147 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-29 |
| | |\ \ \ | | |/ / | |/| | | Brushtool | ||
| | | * | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-28 |
| | | |\ \ | |||
| | | * | | | turn off changing the left and top of the brush stroke canvas | Pushkar Joshi | 2012-03-28 |
| | | | | | | |||
| | | * | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| | | |\ \ \ | |||
| | | * | | | | File IO for the brush stroke AND changing the data type of brush stroke from ↵ | Pushkar Joshi | 2012-03-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | GEOM_TYPE_CUBIC_BEZIER to GEOM_TYPE_BRUSH_STROKE | ||
| | | * | | | | add a setfillcolor to brush stroke so the default fillcolor handler does not ↵ | Pushkar Joshi | 2012-03-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | get called | ||
| | | * | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | ||
| | | * | | | | | correctly update the brush stroke canvas size and position when the stroke ↵ | Pushkar Joshi | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | path is smoothed (and also when the stroke width is changed) AND some code cleanup to remove unnecessary brush stroke properties | ||
| | | * | | | | | correctly update the brush stroke canvas size and position when the stroke ↵ | Pushkar Joshi | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size is changed (does not yet work when smoothing is applied) AND select the newly created brush stroke by default | ||
| | | * | | | | | Almost working version of brush tool that uses only local coordinates to ↵ | Pushkar Joshi | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store the brush stroke points. Current version does not yet update the width and height of the brush stroke canvas upon changing the brush stroke through the PI. Also, current version does not obtain 3D position of points properly from the drawing tool base (see BrushTool _getUnsnappedPosition) | ||
| | | * | | | | | revert to using the angle without flipping its sign...fixing some minor bugs ↵ | Pushkar Joshi | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and code cleanup GOOD status before doing 3D unprojection step | ||
| | | * | | | | | draw the brush stroke in realtime | Pushkar Joshi | 2012-03-19 |
| | | | | | | | | |||
| | | * | | | | | first pass for file IO of brush strokes | Pushkar Joshi | 2012-03-19 |
| | | | | | | | | |||
| | | * | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-16 |
| | | |\ \ \ \ \ | |||
| | | * | | | | | | update values in the PI from values of the selected brush stroke or pen tool ↵ | Pushkar Joshi | 2012-03-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | path | ||
| | | * | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-14 |
| | | |\ \ \ \ \ \ | |||
| | | * | | | | | | | PI for pen and brush strokes | Pushkar Joshi | 2012-03-14 |
| | | | | | | | | | | |||
| | | * | | | | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-03-13 |
| | | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | | Add a smoothing amount parameter, and hide options based on checkboxes | Pushkar Joshi | 2012-03-13 |
| | | | | | | | | | | | |||
| | * | | | | | | | | | Merge pull request #131 from ananyasen/integration-candidate | Valerio Virgillito | 2012-03-28 |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266 | ||
| | | * | | | | | | | | fixed logical error in triggering menu item | Ananya Sen | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | | | | | disable more menus if the active document is not in design view | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | | | | | - removed menu-data boundObj path support for now | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed error on clicking on disabled menu item Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | | | | | KNINJA-1302 : refactored fixed as per request | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | | | | | IKNINJA-1302 : close on ESC even if text field is focussed | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | | | | | IKNINJA-1367 - if filename contains #, then encode # so that the create URI ↵ | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||