aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-02
|\
| * Merge pull request #358 from jreid01/timeline-prValerio Virgillito2012-06-28
| |\
| | * Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
| * | Merge pull request #361 from ericguzman/PresetsUpdate_6_28Valerio Virgillito2012-06-28
| |\ \
| | * | Presets/CSS Panel - Update css panel with preset class.Eric Guzman2012-06-28
| | |/
| * | Merge pull request #354 from mencio/IKNINJA-1829Valerio Virgillito2012-06-28
| |\ \ | | |/ | |/|
| | * removing some commentsValerio Virgillito2012-06-28
| | * Fixing the button for the shape piValerio Virgillito2012-06-28
| * | 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
| |\|
| | * FIX layer selection bugJonathan Duran2012-06-28
| * | 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
| |\|
| | * Timeline: bug fix IKNINJA-1843Jon Reid2012-06-27
| * | Fixing history bugJose 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.Nivesh Rajbhandari2012-06-27
| * | | 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
| | |\ \
| | | * | Bug Fix : Hot Text change from the CSS panelKruti Shah2012-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
| | | | * | | Fix animation names breakingJonathan 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
| | | | | |/ / | | | | |/| |
| | | | * | | 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
| | | | * | | | Fix - deselect tweens when selecting a layerJonathan 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
| | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-26
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-26
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |