aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* video autopsy fix: moving the event handler on creationValerio Virgillito2012-06-28
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/Document' into video-fixValerio Virgillito2012-06-28
|\
| * Relocating codeJose Antonio Marquez2012-06-28
| | | | | | | | I added the fix in the wrong location before, this is more proper, still needs to be moved to where the video element is created or added to the DOM (in this spot the event is added every time src is changed).
| * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-28
| |\
| * | Fixing video autoplay bug in PIJose Antonio Marquez2012-06-28
| | | | | | | | | | | | Adding functionality to prevent autoplay on videos while in author-time. Fixes chrome preview issues.
| * | Preventing video playback on openJose Antonio Marquez2012-06-28
| | | | | | | | | | | | This stops all videos from playing on open file. The same fix needs to be applied when an users sets autoplay in the PI.
* | | Merge pull request #358 from jreid01/timeline-prValerio Virgillito2012-06-28
|\ \ \ | |_|/ |/| | Timeline: Fix for deselect bug.
| * | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
| |/ | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolved: use mine (doesn't matter, affected code block is in commented out section)
* | Merge pull request #361 from ericguzman/PresetsUpdate_6_28Valerio Virgillito2012-06-28
|\ \ | | | | | | Presets/CSS Panel - Update css panel with preset class.
| * | Presets/CSS Panel - Update css panel with preset class.Eric Guzman2012-06-28
| | |
* | | Merge pull request #354 from mencio/IKNINJA-1829Valerio Virgillito2012-06-28
|\ \ \ | | | | | | | | Fixing the button for the shape pi
| * | | removing some commentsValerio Virgillito2012-06-28
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Fixing the button for the shape piValerio Virgillito2012-06-28
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge pull request #355 from dhg637/GIO_binding-viewValerio Virgillito2012-06-28
|\ \ \ \ | |_|/ / |/| | | Gio binding view bugs and fixes
| * | | Binding View - Multi document bug : cleared object bindings when current ↵Armen Kesablyan2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | document is changed Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internal ↵Armen Kesablyan2012-06-28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into GIO_binding-view Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Eric Guzman2012-06-28
| | |\| | | | | | | | | | | | | | | | | Bindables_GIO
| | * | | Binding HUD - Updated CSS for hud and promoted/bound properties.Eric Guzman2012-06-28
| | | | |
| * | | | Binding View - Bug fix After save corrupts doom and breaks binding viewArmen Kesablyan2012-06-28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-27
| |\ \ \ \
| * \ \ \ \ Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internalArmen Kesablyan2012-06-27
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Eric Guzman2012-06-27
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Bindables_GIO
| | * | | | | Binding HUD - CSS UpdateEric Guzman2012-06-27
| | | | | | |
| | * | | | | Binding HUD - Show promoted PI properties at top of listEric Guzman2012-06-27
| | | | | | |
| * | | | | | Binding View - Hide in Live PreviewArmen Kesablyan2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | Binding Hud Not rendering at correct x and yArmen Kesablyan2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | 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>
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | 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
|\| | | | |
| * | | | | 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>
* | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 13:29:54 +0000