| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-18 |
| |\ | |||
| | * | Timeline: Bug fix: changing layer name didn't save in some circumstances. | Jon Reid | 2012-04-17 |
| | | | |||
| | * | Timeline: Further fixes to new document/breadcrumb interactions. | Jon Reid | 2012-04-17 |
| | | | |||
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-18 |
| |\ \ | |/ |/| | |||
| | * | Merge pull request #166 from mqg734/WebGLFixes | Valerio Virgillito | 2012-04-17 |
| | |\ | | | | | | | IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected. | ||
| | | * | Adding back setProperties for canvas because width and height values need to ↵ | Nivesh Rajbhandari | 2012-04-17 |
| | | | | | | | | | | | | | | | | | | | be set as attributes instead of styles. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-04-17 |
| | | |\ | | |/ | |/| | |||
| | * | | Merge pull request #165 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-17 |
| | |\ \ | | | | | | | | | Drag and drop of images and components should not add 3d values by default | ||
| | | * | | Drag and drop of images and components should not add 3d values by default. | Nivesh Rajbhandari | 2012-04-16 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merge pull request #164 from mqg734/ToolTipFixes | Valerio Virgillito | 2012-04-17 |
| | |\ \ \ | | | | | | | | | | | IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for PaintBucket, InkBottle and Eyedropper tools. | ||
| | | * | | | IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for ↵ | Nivesh Rajbhandari | 2012-04-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PaintBucket, InkBottle and Eyedropper tools. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Merge pull request #163 from mencio/undo-manager | Valerio Virgillito | 2012-04-17 |
| | |\ \ \ \ | | |/ / / | |/| | | | Undo manager - Fixing a couple undo bugs and architecture work to support undo/redo | ||
| | | * | | | Fixing the shape border | Valerio Virgillito | 2012-04-13 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | collapsing the history panel by default and commenting out the undo for the ↵ | Valerio Virgillito | 2012-04-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d properties Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | fixed stage rotation | Valerio Virgillito | 2012-04-13 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | clear console log | Valerio Virgillito | 2012-04-13 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | Cleanup | Valerio Virgillito | 2012-04-13 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | fixing the transform handles | Valerio Virgillito | 2012-04-13 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | removing _undo array and _targets array and use object instead of matching ↵ | Valerio Virgillito | 2012-04-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arrays to set properties Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | Merge branch 'refs/heads/master' into undo-manager | Valerio Virgillito | 2012-04-12 |
| | | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | some code cleanup | Valerio Virgillito | 2012-04-10 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | setAttribute added to the undo/redo | Valerio Virgillito | 2012-04-09 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | setProperties to the montage undo/redo | Valerio Virgillito | 2012-04-09 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | adding a history panel | Valerio Virgillito | 2012-04-09 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | | * | IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected. | Nivesh Rajbhandari | 2012-04-17 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | | * | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-04-16 |
| | | | | |\ | | |_|_|/ | |/| | | | |||
| | | | | * | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-03-13 |
| | | | | |\ | |||
| | | | | * \ | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-03-13 |
| | | | | |\ \ | |||
| * | | | | | | | Fix tweens not updating keyframe rules | Jonathan Duran | 2012-04-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | Timeline: Bug fixes for restoring tweens on new document and breadcrumb. | Jon Reid | 2012-04-13 |
| | | | | | | | | |||
| * | | | | | | | Timeline: Bug fix: problem with editing layers missing last letter in new | Jon Reid | 2012-04-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | value. | ||
| * | | | | | | | Timeline: Remove default style track. | Jon Reid | 2012-04-13 |
| | | | | | | | | |||
| * | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-13 |
| |\ \ \ \ \ \ \ | |||
| | * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-13 |
| | |\| | | | | | | |||
| | | * | | | | | | Merge pull request #162 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-12 |
| | | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | offsets should be calculated on offsetParent instead of parentElement. | ||
| | | | * | | | | | Fixing selection/tag layout drawing when canvas and image elements have borders. | Nivesh Rajbhandari | 2012-04-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | | Borders are not factored into offset calculations by the browser, so we have ↵ | Nivesh Rajbhandari | 2012-04-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to adjust for them. Also, we should set webkit-transform-style to preserve-3d if elements are rotated (until we also support flattened mode). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | | offsets should be calculated on offsetParent instead of parentElement. | Nivesh Rajbhandari | 2012-04-11 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | Timeline: More bug fixes for document switching. | Jon Reid | 2012-04-13 |
| | | | | | | | | |||
| * | | | | | | | Timeline: More bug fixes. | Jon Reid | 2012-04-12 |
| | | | | | | | | |||
| * | | | | | | | Timeline: Bug fixes: Document switching between new documents now working. | Jon Reid | 2012-04-12 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixed problem with MasterDuration not being set correctly on document switch. | ||
| * | | | | | | Timeline: Fixing the animated Element | Kruti Shah | 2012-04-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | | | Timeline : Replace Element Taken Care of | Kruti Shah | 2012-04-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-12 |
| |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-11 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used mine. | ||
| | * | | | | | | | Timeline: Change Master Layer configuration menu to be on click; bug fix: | Jon Reid | 2012-04-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Master Layer config menu does not scroll with layers. Bug fix: New layers do not take into account "show only animated layers" feature. | ||
| * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-12 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| | * | | | | | | | Merge pull request #161 from mqg734/PerspectiveFix | Valerio Virgillito | 2012-04-11 |
| | |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | IKNinja-812 - Perspective fix | ||
| | | * | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixes | Nivesh Rajbhandari | 2012-04-09 |
| | | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | | * | | | | | | Single perspective fix. | Nivesh Rajbhandari | 2012-04-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that rotating multiple objects when the stage is rotated still doesn't work and flatten still doesn't work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||