aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into google-components-fixesValerio Virgillito2012-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
| |/
| * Merge pull request #340 from mencio/panel-cleanup-scrollValerio Virgillito2012-06-26
| |\ | | | | | | Panel cleanup scroll
| | * Merge branch 'refs/heads/master' into panel-cleanup-scrollValerio Virgillito2012-06-26
| | |\
| | * | removing un-necessary panel styles and possibly fix IKNINJA-1626Valerio Virgillito2012-06-26
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | 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 #323 from dhg637/bindingValerio Virgillito2012-06-26
|\ \ \ | | | | | | | | Binding View - Binding Tool & Binding Panel
| * | | Reverting binding.jsArmen Kesablyan2012-06-26
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Binding View - Removed DebuggerArmen Kesablyan2012-06-26
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Binding View - Objects Replace existing source Object if it existsArmen Kesablyan2012-06-25
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Can bind Multiple instanceArmen Kesablyan2012-06-25
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-25
| | |\ \ \
| * | | | | Binding Panel - Changing direction in edit mode doesn't apply dirty to the ↵Armen Kesablyan2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edit form Check/Uncheck the Binding direction (Oneway) check box in the binding setting doesn't enable "SAVE" button. Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Binding Panel - Can Now Edit and Delete BindingsArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug Description: Binding Arguments that are passed in the edit form were being set to null after it was set. Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Binding View: Fixed If Selected Div Erroring OutArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Removed Console LogsArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Text Tool Fix - Can Not Switch Document when Text Tool InitializedArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Binding View - Hide when in code viewEric Guzman2012-06-21
| | | | | |
| * | | | | Hintable - Remove overridden methodEric Guzman2012-06-21
| | | | | |
| * | | | | Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-21
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-21
| |\ \ \ \ \ \
| | * | | | | | Binding View: Hud Scroll Limit Is now 8Armen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Binding View - Minor Fixes to remove warningsArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | Binding HUD - CSS UpdateEric Guzman2012-06-21
| | | | | | | |
| * | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-20
| |\| | | | | |
| | * | | | | | Binding Panel - Fixed Panel ButtonArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-20
| |\| | | | | |
| | * | | | | | BindingView :Montage UpdatesArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| | | |\ \ \ \ \
| | * | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\| | | | | |
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| | | |\ \ \ \ \ \
| | * | | | | | | | Binding-View : Polish stateArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | Merge branch 'refs/heads/binding_eric' into bindingArmen Kesablyan2012-06-20
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-20
| |\| | | | | | | | | | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | binding-hud Scroll UpArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | Binding HUD - Show hud for "off stage" objects in trayEric Guzman2012-06-20
| | | | | | | | | |
| * | | | | | | | | Objects Tray - Use label instead of identifier for object nameEric Guzman2012-06-20
| | | | | | | | | |
| * | | | | | | | | Objects Tray - Filter list of components for those without visual representationEric Guzman2012-06-20
| | | | | | | | | |
| * | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-20
| |\| | | | | | | |
| | * | | | | | | | Binding View - Hover ScrollArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-20
| |\| | | | | | | |
| | * | | | | | | | Showing Bound Items in hudArmen Kesablyan2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | Binding View - Added Line cap in drawing line & Fixed bug to not pop up on ↵Armen Kesablyan2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | current c