aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Styles Controller - Fix specificity comparison in hasGreaterSpecificity()Eric Guzman2012-06-27
|
* Merge pull request #347 from mqg734/ComponentShapeToolBugValerio Virgillito2012-06-27
|\ | | | | Temporarily disable ElementMediator's addDelegate when adding components.
| * Temporarily disable ElementMediator's addDelegate when adding components.Nivesh Rajbhandari2012-06-27
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge pull request #344 from mencio/google-components-fixesValerio Virgillito2012-06-27
|\ \ | | | | | | Google components fixes
| * \ 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
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | fix for the youtube giving an error when having less than 3 imagesValerio Virgillito2012-06-26
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge pull request #342 from imix23ways/Timeline-pullrequestValerio Virgillito2012-06-27
|\ \ \ \ | | | | | | | | | | Timeline Bugfixes
| * \ \ \ Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-06-27
| |\ \ \ \
| | * | | | Bug Fix : Hot Text change from the CSS panelKruti Shah2012-06-27
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | Fix live preview animation lockJonathan Duran2012-06-27
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | 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
| | | |/ / / | | |/| | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | Fix element getting stuck with live preview modeJonathan Duran2012-06-27
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | 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
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | deselection help apply style property Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | Fix keyframe selection stickinessJonathan Duran2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | will no longer change the selection.
| | | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including splitting tweens.
| | * | | | | | Fix missing serialization in Layer.jsJonathan Duran2012-06-26
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
| | |\| | | |
| | | * | | | Timeline: Bug fix: Indexing on styles when loading files.Jon Reid2012-06-26
| | | | | | |
| | | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-26
| | | |\ \ \ \
| | | * | | | | Timeline: Bug fix IKNINJA-1816Jon Reid2012-06-26
| | | | | | | |
| | * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-26
| | |\ \ \ \ \ \
| | * | | | | | | Fix - deselect tweens when selecting a layerJonathan Duran2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-26
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-06-26
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-26
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-27
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Bug Fix: Fix Animation for Position & Size PropsKruti Shah2012-06-27
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-26
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-26
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Fix sub prop tween selection to select main tweenJonathan Duran2012-06-26
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | Fix sub prop animationsJonathan Duran2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | Fix end animation for style tracksJonathan Duran2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | Fix animation to end at last keyframeJonathan Duran2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Bug Fix : Color Chip PositionKruti Shah2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | BugFix - Color Chip Positioning & Checking for null value of the current colorKruti Shah2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-26
| |\| | | | | |
| | * | | | | | Fix play marker appearing in wrong position when clicking on a tweenJonathan Duran2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | Move time marker when clicking anywhere in timeline tracksJonathan Duran2012-06-26
| | | | | | | | | | | | | | | | | | | |