aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-28
|\ | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used Theirs, doesn't matter, code block is in commented-out section.
| * FIX layer selection bugJonathan Duran2012-06-28
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * 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.
| | * 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 pull request #343 from ericguzman/CSSPanel_GIOValerio Virgillito2012-06-27
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Css panel gio
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Eric Guzman2012-06-27
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | CSSPanel_GIO
| | * | | | IKNINJA-1659 - Fix error when calling preventDefault()Eric Guzman2012-06-26
| | | | | |
| | * | | | IKNINJA-1667 - Fix for JIRA issue involving updating rule list on selection ↵Eric Guzman2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | change.
* | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
| |_|_|/ / |/| | | |
* | | | | 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
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #339 from ananyasen/bugfix-masterValerio Virgillito2012-06-27
| |\ \ \ \ \ | | |_|/ / / | |/| | | | fixed code hinting and autocompletion bug
| | * | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-27
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #341 from ericguzman/Chrome20_CSS_WorkaroundValerio Virgillito2012-06-27
| |\ \ \ \ \ | | | | | | | | | | | | | | Styles Controller - Chrome 20 Fix
| | * | | | | Styles Controller - Remove debuggerEric Guzman2012-06-26
| | | | | | |
| | * | | | | Styles Controller - Chrome 20 FixEric Guzman2012-06-26
| |/ / / / /
| | * | | | initialize auto code hinting flag with checkbox value, on switching between ↵Ananya Sen2012-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | turning off autocompletion since it is interfering typingAnanya Sen2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-26
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | refactored to move bindings to templateAnanya Sen2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-26
| | |\ \ \ \
| | * | | | | fixed code hinting and autocompletion bugAnanya Sen2012-06-26
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | 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-23 13:11:40 +0000