aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| |\| | | | | | | | |
| * | | | | | | | | | fixing someValerio Virgillito2012-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Fixing reference to objectJose Antonio Marquez2012-06-28
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-28
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | 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 branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-29
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | / / / / / | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ColorGradientFixNivesh Rajbhandari2012-06-29
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #350 from ericguzman/StylesController_6_27Valerio Virgillito2012-06-29
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | Styles Controller - Fix specificity comparison in hasGreaterSpecificity
| | | * | | | | | | | Styles Controller - removing console logsEric Guzman2012-06-29
| | | | | | | | | | |
| | | * | | | | | | | Styles Controller - Fix specificity comparison in hasGreaterSpecificity()Eric Guzman2012-06-27
| | | | | | | | | | |
| | * | | | | | | | | Merge pull request #351 from ananyasen/bugfix-masterValerio Virgillito2012-06-28
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | fixed IKNINJA-1762 [Copy/Cut on canvas tag tool throws error on console]
| | | * | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-28
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | * | | | | | | | fixed IKNINJA-1762 [Copy/Cut on canvas tag tool throws error on console] -> ↵Ananya Sen2012-06-27
| | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't generate data-RDGE-id for simple canvas element Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | 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
| | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | |