Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | | | Timeline fix - remove unneeded binding | Jonathan Duran | 2012-06-22 | |
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into timeline-deletekeyframefix | Jonathan Duran | 2012-06-22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | FIx - can't delete keyframes | Jonathan Duran | 2012-06-22 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | Fixing alpha memory bug on reopen | Jose Antonio Marquez | 2012-06-26 | |
* | | | | | | | | | | | | | | | | Partially fixing alpha issues on gradient stops | Jose Antonio Marquez | 2012-06-25 | |
* | | | | | | | | | | | | | | | | Fixing alpha bugs on color chips | Jose Antonio Marquez | 2012-06-25 | |
* | | | | | | | | | | | | | | | | Adding default values to chip | Jose Antonio Marquez | 2012-06-25 | |
* | | | | | | | | | | | | | | | | Fixing alpha slider for chip popups | Jose Antonio Marquez | 2012-06-25 | |
* | | | | | | | | | | | | | | | | Fixing alpha binding bug | Jose Antonio Marquez | 2012-06-25 | |
* | | | | | | | | | | | | | | | | Fixing bottom hit test for popup | Jose Antonio Marquez | 2012-06-25 | |
* | | | | | | | | | | | | | | | | 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 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Cleaning up events | Jose Antonio Marquez | 2012-06-25 | |
* | | | | | | | | | | | | | | | Color Popup Test Candidate | Jose Antonio Marquez | 2012-06-25 | |
* | | | | | | | | | | | | | | | Adding support for gradients on chips | Jose Antonio Marquez | 2012-06-23 | |
* | | | | | | | | | | | | | | | Fixing logic for popup value bubbling | Jose Antonio Marquez | 2012-06-23 | |
* | | | | | | | | | | | | | | | Deleting obsolete files | Jose Antonio Marquez | 2012-06-23 | |
* | | | | | | | | | | | | | | | Added third gradient chip popup | Jose Antonio Marquez | 2012-06-22 | |
* | | | | | | | | | | | | | | | Fix closing logic and init color on chip | Jose Antonio Marquez | 2012-06-22 | |
* | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | 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 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Merge pull request #321 from imix23ways/Timeline-merge-candidate | Valerio Virgillito | 2012-06-21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 | |
* | | | | | | | | | | | | | | | | | | | Replacing temp color chip pop | Jose Antonio Marquez | 2012-06-21 | |
|/ / / / / / / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-21 | |
|\| | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | remove bad file | Jonathan Duran | 2012-06-20 | |
| |/ / / / / / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | | | | | 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 | |
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-20 | |
| |\| | | | | | | | | | | | | |