aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | Fixing bottom hit test for popupJose Antonio Marquez2012-06-25
| * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Cleaning up eventsJose Antonio Marquez2012-06-25
| * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Color Popup Test CandidateJose Antonio Marquez2012-06-25
| * | | | | | | | | | | | | Adding support for gradients on chipsJose Antonio Marquez2012-06-23
| * | | | | | | | | | | | | Adding gradient mode to toolsJose Antonio Marquez2012-06-23
| * | | | | | | | | | | | | Fixing logic for popup value bubblingJose Antonio Marquez2012-06-23
| * | | | | | | | | | | | | Deleting obsolete filesJose Antonio Marquez2012-06-23
| * | | | | | | | | | | | | Added third gradient chip popupJose Antonio Marquez2012-06-22
| * | | | | | | | | | | | | Fixing bug with gradient stop limitsJose Antonio Marquez2012-06-22
| * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix closing logic and init color on chipJose Antonio Marquez2012-06-22
| * | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Replacing temp color chip popJose Antonio Marquez2012-06-21
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | clean upJonathan Duran2012-06-28
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
* | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | FIX layer selection bugJonathan Duran2012-06-28
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | Bug Fix : Hot text updates with keyframe selectionKruti Shah2012-06-28
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | / / / Timeline: bug fix IKNINJA-1843Jon Reid2012-06-27
| |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #347 from mqg734/ComponentShapeToolBugValerio Virgillito2012-06-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Temporarily disable ElementMediator's addDelegate when adding components.Nivesh Rajbhandari2012-06-27
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #344 from mencio/google-components-fixesValerio Virgillito2012-06-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'refs/heads/master' into google-components-fixesValerio Virgillito2012-06-27
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | including the map icons inside the component and adding the empty categoryValerio Virgillito2012-06-26
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #342 from imix23ways/Timeline-pullrequestValerio Virgillito2012-06-27
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-06-27
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Bug Fix : Hot Text change from the CSS panelKruti Shah2012-06-27
| * | | | | | | | | | | | Fix live preview animation lockJonathan Duran2012-06-27
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-27
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-27
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Timeline: Bug fix: Hintable should work better now.Jon Reid2012-06-27
| | * | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-27
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Fix animation names breakingJonathan Duran2012-06-27
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fix element getting stuck with live preview modeJonathan Duran2012-06-27
| | * | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-27
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| * | | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-27
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Bug Fix : PI changes in Position updates the hottest in timeline & Keyframes ...Kruti Shah2012-06-27
| | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-27
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | FIx - hook up play button in timeline to live previewJonathan Duran2012-06-26
| | * | | | | | | | | | | Fix keyframe selection stickinessJonathan Duran2012-06-26
| | * | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Timeline: Bug fix: Adding or splitting tweens on multiple layers at onceJon Reid2012-06-26
| | | * | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-26
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Timeline: Bug fix: Keyboard shortcut now works for adding keyframes,Jon Reid2012-06-26
| | * | | | | | | | | | | | | Fix missing serialization in Layer.jsJonathan Duran2012-06-26
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | |