aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-03
|\
| * Timeline: Bug fix: IKNINJA-1431, "Adding a new element to the stage with oneJon Reid2012-04-02
| | | | | | | | | | layer in focus whose name is empty, Ninja creates an empty name layer for the element."
| * Timeline: Autoscrolling when dragging a layer within a scrollable layerJon Reid2012-04-02
| | | | | | | | list.
| * Timeline: Move drag-and-drop helper deletion to draw routine. Bug fix:Jon Reid2012-03-30
| | | | | | | | better handling of drag-and-drop finish events and cleanup of helper.
| * Timeline: Link layerDragEnd and layerDrop events to better handle end ofJon Reid2012-03-30
| | | | | | | | drag-and-drop events.
| * Timeline: Bug fixes.Jon Reid2012-03-30
| |
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-03
|\ \ | |/ |/|
| * Merge pull request #148 from ananyasen/integration-candidateValerio Virgillito2012-04-01
| |\ | | | | | | added text paste detection and updated some menu items
| | * - using clipboard data directly to avoid using setTimeoutAnanya Sen2012-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 dialogAnanya Sen2012-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 menuAnanya Sen2012-03-28
| | | | | | | | | | | | | | | | | | Disabled cut, copy, paste, debug, since that functionality is not there yet Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Merge pull request #151 from ericguzman/CSSPanel_AnimationDurationFixValerio Virgillito2012-03-30
| |\ \ | | | | | | | | CSS Panel - Fix animation duration value updates from "infinite" to int...
| | * | CSS Panel - Fix animation duration value updates from "infinite" to integer.Eric Guzman2012-03-29
| |/ /
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-30
|\| |
| * | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ | | |/ | |/| Brushtool
| | * Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| | |\
| | * | turn off changing the left and top of the brush stroke canvasPushkar Joshi2012-03-28
| | | |
| | * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| | |\ \
| | * | | File IO for the brush stroke AND changing the data type of brush stroke from ↵Pushkar Joshi2012-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 Joshi2012-03-27
| | | | | | | | | | | | | | | | | | | | get called
| | * | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| | * | | | correctly update the brush stroke canvas size and position when the stroke ↵Pushkar Joshi2012-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 Joshi2012-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 Joshi2012-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 Joshi2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and code cleanup GOOD status before doing 3D unprojection step
| | * | | | draw the brush stroke in realtimePushkar Joshi2012-03-19
| | | | | |
| | * | | | first pass for file IO of brush strokesPushkar Joshi2012-03-19
| | | | | |
| | * | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-16
| | |\ \ \ \
| | * | | | | update values in the PI from values of the selected brush stroke or pen tool ↵Pushkar Joshi2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | path
| | * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-03-14
| | |\ \ \ \ \
| | * | | | | | PI for pen and brush strokesPushkar Joshi2012-03-14
| | | | | | | |
| | * | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-13
| | |\ \ \ \ \ \
| | * | | | | | | Add a smoothing amount parameter, and hide options based on checkboxesPushkar Joshi2012-03-13
| | | | | | | | |
* | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-03-29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Timeline: Stability fixes for drag-and-drop and page switching.Jon Reid2012-03-27
| | | | | | | | | |
* | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-29
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
| | * | | | | | | fixed logical error in triggering menu itemAnanya Sen2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | disable more menus if the active document is not in design viewAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | - removed menu-data boundObj path support for nowAnanya Sen2012-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 requestAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | IKNINJA-1302 : close on ESC even if text field is focussedAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | IKNINJA-1367 - if filename contains #, then encode # so that the create URI ↵Ananya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | path includes the full filename Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | IKNINJA-1361: autofocus and auto-select file name on open of new file and ↵Ananya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | IKNINJA-1364 : fixed css so that white spaces are not collapsed while renderingAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | IKNINJA-1302 : more fixAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | file picker - added size unitAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new file - don't disable OK is file exists Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | IKNINJA-1266 : restrict tab size for long file names and resize tabs on ↵Ananya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | window resize Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | IKNINJA-1302 : For File>New and File>SaveAll dialogs, 'ESC' key now ↵Ananya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | <