| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Bug Fix: Fix Animation for Position & Size Props | Kruti Shah | 2012-06-27 |
| | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-26 |
| |\ | |||
| | * | Merge pull request #336 from mqg734/IKNinja_1688 | Valerio Virgillito | 2012-06-26 |
| | |\ | | | | | | | IKNinja-1688 - Creating a banner file after a code file causes body div to shift to the right and has different scroll bars. | ||
| | | * | IKNinja-1688 - Creating a banner file after a code file causes body div to ↵ | Nivesh Rajbhandari | 2012-06-25 |
| | | | | | | | | | | | | | | | | | | | shift to the right and has different scroll bars. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge branch 'refs/heads/NINJAmaster' into Timeline-bugfix1 | Jonathan Duran | 2012-06-25 |
| | |\| | |||
| * | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-26 |
| |\ \ \ | |||
| | * | | | Fix sub prop tween selection to select main tween | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | Fix sub prop animations | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | Fix end animation for style tracks | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | Fix animation to end at last keyframe | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | Bug Fix : Color Chip Position | Kruti Shah | 2012-06-26 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | BugFix - Color Chip Positioning & Checking for null value of the current color | Kruti Shah | 2012-06-26 |
| |/ / / | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | Fix play marker appearing in wrong position when clicking on a tween | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Move time marker when clicking anywhere in timeline tracks | Jonathan Duran | 2012-06-26 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 |
| |\ \ \ | |||
| | * | | | Timeline: bug fix: command-click now works for multi selecting layers on ↵ | Jon Reid | 2012-06-25 |
| | | | | | | | | | | | | | | | | | Macs. Also disabled control-click on macs. | ||
| | * | | | Timeline: Bug fix IKNINJA-1812, "Easing option switches to None | Jon Reid | 2012-06-25 |
| | | | | | | | | | | | | | | | | | automatically when moving a keyframe" | ||
| | * | | | Timeline: CSS fixes. | Jon Reid | 2012-06-25 |
| | | | | | |||
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-26 |
| |\ \ \ \ | | |_|/ | |/| | | |||
| | * | | | Fixing our textfield component to support binding. Fix for IKNINJA-1394 | Valerio Virgillito | 2012-06-22 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Timeline Bug fixes | Jonathan Duran | 2012-06-26 |
| | |/ / |/| | | | | | | | | | | | | | | Fix keyframe selection updating stage for sub props. Fix tween 0 for sub props on re-open. Fix repetition mismatch for styles and position tracks. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-25 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both. | ||
| | * | | Timeline Fix - reopen subprop keyframes for Position and Size correctly | Jonathan Duran | 2012-06-25 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Timeline fix - remove unneeded binding | Jonathan Duran | 2012-06-22 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Merge branch 'refs/heads/NINJAmaster' into timeline-deletekeyframefix | Jonathan Duran | 2012-06-22 |
| | |\| | |||
| | | * | Merge pull request #320 from ananyasen/cut-copy-paste | Valerio Virgillito | 2012-06-21 |
| | | |\ | | | | | | | | | copy cut paste - project phase 1 check in | ||
| | | | * | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-21 |
| | | | |\ | |||
| | | | * \ | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-20 |
| | | | |\ \ | |||
| | | | * \ \ | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-19 |
| | | | |\ \ \ | |||
| | | | * \ \ \ | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-13 |
| | | | |\ \ \ \ | |||
| | | | * \ \ \ \ | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-12 |
| | | | |\ \ \ \ \ | |||
| | | | * | | | | | | - removed extra selection change event, | Ananya Sen | 2012-06-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - displace element after adding it to the document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | FIx - can't delete keyframes | Jonathan Duran | 2012-06-22 |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | F5 now deletes the selected keyframe Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | | Merge pull request #321 from imix23ways/Timeline-merge-candidate | Valerio Virgillito | 2012-06-21 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | FIX Timeline - Can't insert keyframes to a css style layer | ||
| | | * \ \ \ \ \ \ | Merge branch 'refs/heads/Timeline-local-kruti' into Timeline-merge-candidate | Jonathan Duran | 2012-06-21 |
| | | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||
| | | | * | | | | | | Sub Property ADding KEyframe fixed | Kruti Shah | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-21 |
| | |\| | | | | | | | |||
| | | * | | | | | | | remove bad file | Jonathan Duran | 2012-06-20 |
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-20 |
| | | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-20 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-19 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | LockedElements - Layers | Kruti Shah | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | | | | | | Layer Lock | Kruti Shah | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | | | | | | Lock Elements | Kruti Shah | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | | | | | | Lock ELements | Kruti Shah | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | | | | | | Locked Elements. Layer Controls | Kruti Shah | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-20 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||
| | * | | | | | | | | | | Adding transparent background to color chip buttons | Jose Antonio Marquez | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a transparent pattern to the background of color chips consumed in the app, this way you can preview colors in alpha. This was lost, just added back again. Not a big change, just minor CSS, so should only be quickly tested prior to merge. | ||
| * | | | | | | | | | | | Timeline: Breadcrumb hash in currentDocument will now update as changes | Jon Reid | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||