aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #359 from mencio/live-preview-buttonValerio Virgillito2012-06-28
|\ | | | | Live preview button and canvas are kept on timeline play
| * Changing the livePreview button to do a chromePreview and keeping the canvas ↵Valerio Virgillito2012-06-28
|/ | | | | | when doing a timeline play Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge pull request #349 from joseeight/ColorValerio Virgillito2012-06-28
|\ | | | | Color
| * Fixing body PI background getterJose Antonio Marquez2012-06-28
| |
| * Fixing chips updating with alpha changeJose Antonio Marquez2012-06-28
| |
| * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-28
| |\ | |/ |/|
* | Merge pull request #353 from imix23ways/Timeline-criticalfixValerio Virgillito2012-06-28
|\ \ | | | | | | FIX layer selection bug
| * | FIX layer selection bugJonathan Duran2012-06-28
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * Fixing body background bugJose Antonio Marquez2012-06-28
| | |
| | * Fixing init alpha issueJose Antonio Marquez2012-06-28
| | |
| | * Fixing color panel sliders updatingJose Antonio Marquez2012-06-28
| | |
| | * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-28
| | |\ | |_|/ |/| |
* | | Merge pull request #352 from imix23ways/Timeline-IKNINJA-1843Valerio Virgillito2012-06-27
|\| | | | | | | | Timeline: bug fix IKNINJA-1843
| * | Timeline: bug fix IKNINJA-1843Jon Reid2012-06-27
|/ /
| * Fixing history bugJose Antonio Marquez2012-06-27
| |
| * Fixing IKNINJA-1634Jose Antonio Marquez2012-06-27
| |
| * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-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>
| | | | * Fixing minor color history bugJose Antonio Marquez2012-06-27
| | | | |
| | | | * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-27
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | 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
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 06:29:43 +0000