| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 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 |
| | |\| | |||
| | * | | 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 |
| | |\ \ | |||
| | * | | | FIx - can't delete keyframes | Jonathan Duran | 2012-06-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | F5 now deletes the selected keyframe Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | Fixing alpha memory bug on reopen | Jose Antonio Marquez | 2012-06-26 |
| | | | | | | | | | | | | | | | | | This is for the color chip | ||
| * | | | | Partially fixing alpha issues on gradient stops | Jose Antonio Marquez | 2012-06-25 |
| | | | | | | | | | | | | | | | | | Still need to implement getting value on retrieve while opening | ||
| * | | | | Fixing alpha bugs on color chips | Jose Antonio Marquez | 2012-06-25 |
| | | | | | | | | | | | | | | | | | Getting the right value of alpha on reopening color chips. | ||
| * | | | | Adding default values to chip | Jose Antonio Marquez | 2012-06-25 |
| | | | | | | | | | | | | | | | | | This is a fallback is null and alpha is changed. | ||
| * | | | | Fixing alpha slider for chip popups | Jose Antonio Marquez | 2012-06-25 |
| | | | | | |||
| * | | | | Fixing alpha binding bug | Jose Antonio Marquez | 2012-06-25 |
| | | | | | | | | | | | | | | | | | The chip popup alpha sliders were binding to the panel when they shouldn't, so added a check. | ||
| * | | | | Fixing bottom hit test for popup | Jose Antonio Marquez | 2012-06-25 |
| | | | | | | | | | | | | | | | | | This address clicking outside (below) and closing the popup. The wrong value was being used. | ||
| * | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-25 |
| |\ \ \ \ | | |_|/ | |/| | | |||
| | * | | | Fixing our textfield component to support binding. Fix for IKNINJA-1394 | Valerio Virgillito | 2012-06-22 |
| | | |/ | |/| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Cleaning up events | Jose Antonio Marquez | 2012-06-25 |
| | | | | | | | | | | | | | Adding/Removing events when only needed by color popups. | ||
| * | | | Color Popup Test Candidate | Jose Antonio Marquez | 2012-06-25 |
| | | | | | | | | | | | | | Preliminary check in for testing to commence on new color popup functionality. | ||
| * | | | Adding support for gradients on chips | Jose Antonio Marquez | 2012-06-23 |
| | | | | | | | | | | | | | Need to handle other color modes, currently only handling HSV and gradients. Working on getting other modes supported. Also, will need clean up color popup manager after completion. | ||
| * | | | Fixing logic for popup value bubbling | Jose Antonio Marquez | 2012-06-23 |
| | | | | | | | | | | | | | Only working for HSV, need to implement HEX and gradient | ||
| * | | | Deleting obsolete files | Jose Antonio Marquez | 2012-06-23 |
| | | | | |||
| * | | | Added third gradient chip popup | Jose Antonio Marquez | 2012-06-22 |
| | | | | | | | | | | | | | Need to add support for gradient events dispatching from standalone chips. Just need to hook up relays for events besides HSV to bubble up. | ||
| * | | | Fix closing logic and init color on chip | Jose Antonio Marquez | 2012-06-22 |
| | | | | | | | | | | | | | Added improved logic to handle toggling from button the color popup. Also added an init color method for the chip to initialize color in it's popup. | ||
| * | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-21 |
| |\| | | |||
| | * | | 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> | ||
| | * | | | | | | | 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> | ||
| * | | | | | | | | | Replacing temp color chip pop | Jose Antonio Marquez | 2012-06-21 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the temporary color chip popup with a main popup used universally throughout the app. There are still outstanding issues to be addressed, this is just the initial set up before debugging issues. | ||
| * | | | | | | | | 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/timeline-local' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| | | |\ \ \ \ \ \ | |||
| | | | * | | | | | | Timeline: Bug fix: Keyframe animation now works with 3D elements. | Jon Reid | 2012-06-20 |
| | | | | | | | | | | |||
| | | | * | | | | | | Merge remote-tracking branch 'ninja-internal/master' into timeline-local | Jon Reid | 2012-06-20 |
| | | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | |||
| | | * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||
| | | * | | | | | | | remove unneeded files | 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 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | | * | | | | | | remove obsolete functions | Jonathan Duran | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-19 |
| | | |\ \ \ \ \ \ | |||
| | | * | | | | | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOM | Jon Reid | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manipulation! | ||
| | * | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-19 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||
| | | * | | | | | | | prop tween splitting | Jonathan Duran | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||