| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | | | * | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-28 | |
| | | | | |\ \ | | | |_|/ / | | |/| | | | ||||
| | | | | * | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-28 | |
| | | | | |\ \ | ||||
| | | | | * \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-27 | |
| | | | | |\ \ \ | ||||
| | | | | * \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-25 | |
| | | | | |\ \ \ \ | ||||
| | | | | * \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-22 | |
| | | | | |\ \ \ \ \ | ||||
| | | | | * \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-22 | |
| | | | | |\ \ \ \ \ \ | ||||
| | | | | * \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-21 | |
| | | | | |\ \ \ \ \ \ \ | ||||
| | | | | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-21 | |
| | | | | |\ \ \ \ \ \ \ \ | ||||
| | | | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-20 | |
| | | | | |\ \ \ \ \ \ \ \ \ | ||||
| | | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-20 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | \ \ \ \ \ \ \ \ \ \ | Merge pull request #358 from jreid01/timeline-pr | Valerio Virgillito | 2012-06-28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | Timeline: Fix for deselect bug. | |||
| | * | | | | | | | | | | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers. | Jon Reid | 2012-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_28 | Valerio Virgillito | 2012-06-28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Presets/CSS Panel - Update css panel with preset class. | |||
| | * | | | | | | | | | | | | | | Presets/CSS Panel - Update css panel with preset class. | Eric Guzman | 2012-06-28 | |
| | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Merge pull request #354 from mencio/IKNINJA-1829 | Valerio Virgillito | 2012-06-28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the button for the shape pi | |||
| | * | | | | | | | | | | | | | | removing some comments | Valerio Virgillito | 2012-06-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | | | | | | | | | | | Fixing the button for the shape pi | Valerio Virgillito | 2012-06-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | | | | | | | | | | Merge pull request #355 from dhg637/GIO_binding-view | Valerio Virgillito | 2012-06-28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Gio binding view bugs and fixes | |||
| | * | | | | | | | | | | | | | | Binding View - Multi document bug : cleared object bindings when current ↵ | Armen Kesablyan | 2012-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 Kesablyan | 2012-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 Guzman | 2012-06-28 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bindables_GIO | |||
| | | * | | | | | | | | | | | | | | Binding HUD - Updated CSS for hud and promoted/bound properties. | Eric Guzman | 2012-06-28 | |
| | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | Binding View - Bug fix After save corrupts doom and breaks binding view | Armen Kesablyan | 2012-06-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-27 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internal | Armen Kesablyan | 2012-06-27 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Eric Guzman | 2012-06-27 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bindables_GIO | |||
| | | * | | | | | | | | | | | | | | | | Binding HUD - CSS Update | Eric Guzman | 2012-06-27 | |
| | | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | Binding HUD - Show promoted PI properties at top of list | Eric Guzman | 2012-06-27 | |
| | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | Binding View - Hide in Live Preview | Armen Kesablyan | 2012-06-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | |||
| | * | | | | | | | | | | | | | | | | | Binding Hud Not rendering at correct x and y | Armen Kesablyan | 2012-06-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||