Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | Replacing temp color chip pop | Jose Antonio Marquez | 2012-06-21 | |
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | clean up | Jonathan Duran | 2012-06-28 | |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers. | Jon Reid | 2012-06-28 | |
* | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | FIX layer selection bug | Jonathan Duran | 2012-06-28 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | ||||
* / | | | | | | | | | | | | | | Bug Fix : Hot text updates with keyframe selection | Kruti Shah | 2012-06-28 | |
|/ / / / / / / / / / / / / / | ||||
* | | | | | | | | | | | / / | Timeline: bug fix IKNINJA-1843 | Jon Reid | 2012-06-27 | |
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge pull request #347 from mqg734/ComponentShapeToolBug | Valerio Virgillito | 2012-06-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Temporarily disable ElementMediator's addDelegate when adding components. | Nivesh Rajbhandari | 2012-06-27 | |
* | | | | | | | | | | | | | Merge pull request #344 from mencio/google-components-fixes | Valerio Virgillito | 2012-06-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge branch 'refs/heads/master' into google-components-fixes | Valerio Virgillito | 2012-06-27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | | including the map icons inside the component and adding the empty category | Valerio Virgillito | 2012-06-26 | |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||
* | | | | | | | | | | | | Merge pull request #342 from imix23ways/Timeline-pullrequest | Valerio Virgillito | 2012-06-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber | Jonathan Duran | 2012-06-27 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | Bug Fix : Hot Text change from the CSS panel | Kruti Shah | 2012-06-27 | |
| * | | | | | | | | | | | | Fix live preview animation lock | Jonathan Duran | 2012-06-27 | |
| |/ / / / / / / / / / / | ||||
| * | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-27 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-27 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | Timeline: Bug fix: Hintable should work better now. | Jon Reid | 2012-06-27 | |
| | * | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-27 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Fix animation names breaking | Jonathan Duran | 2012-06-27 | |
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | Fix element getting stuck with live preview mode | Jonathan Duran | 2012-06-27 | |
| | * | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-27 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | | Bug Fix : PI changes in Position updates the hottest in timeline & Keyframes ... | Kruti Shah | 2012-06-27 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-27 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | FIx - hook up play button in timeline to live preview | Jonathan Duran | 2012-06-26 | |
| | * | | | | | | | | | | | Fix keyframe selection stickiness | Jonathan Duran | 2012-06-26 | |
| | * | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | Timeline: Bug fix: Adding or splitting tweens on multiple layers at once | Jon Reid | 2012-06-26 | |
| | | * | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-26 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | Timeline: Bug fix: Keyboard shortcut now works for adding keyframes, | Jon Reid | 2012-06-26 | |
| | * | | | | | | | | | | | | | Fix missing serialization in Layer.js | Jonathan Duran | 2012-06-26 | |
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 | |
| | |\| | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Timeline: Bug fix: Indexing on styles when loading files. | Jon Reid | 2012-06-26 | |
| | | * | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-26 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | Timeline: Bug fix IKNINJA-1816 | Jon Reid | 2012-06-26 | |
| | * | | | | | | | | | | | | | Fix - deselect tweens when selecting a layer | Jonathan Duran | 2012-06-26 | |
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | |