Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #343 from ericguzman/CSSPanel_GIO | Valerio Virgillito | 2012-06-27 |
|\ | | | | | Css panel gio | ||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Eric Guzman | 2012-06-27 |
| |\ | | | | | | | | | | CSSPanel_GIO | ||
| * | | IKNINJA-1659 - Fix error when calling preventDefault() | Eric Guzman | 2012-06-26 |
| | | | |||
| * | | IKNINJA-1667 - Fix for JIRA issue involving updating rule list on selection ↵ | Eric Guzman | 2012-06-26 |
| | | | | | | | | | | | | change. | ||
* | | | Merge pull request #339 from ananyasen/bugfix-master | Valerio Virgillito | 2012-06-27 |
|\ \ \ | |_|/ |/| | | fixed code hinting and autocompletion bug | ||
| * | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-master | Ananya Sen | 2012-06-27 |
| |\ \ | |/ / |/| | | |||
* | | | Merge pull request #341 from ericguzman/Chrome20_CSS_Workaround | Valerio Virgillito | 2012-06-27 |
|\ \ \ | | | | | | | | | Styles Controller - Chrome 20 Fix | ||
| * | | | Styles Controller - Remove debugger | Eric Guzman | 2012-06-26 |
| | | | | |||
| * | | | Styles Controller - Chrome 20 Fix | Eric Guzman | 2012-06-26 |
|/ / / | |||
| * | | initialize auto code hinting flag with checkbox value, on switching between ↵ | Ananya Sen | 2012-06-27 |
| | | | | | | | | | | | | | | | | | | documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | turning off autocompletion since it is interfering typing | Ananya Sen | 2012-06-26 |
| | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-master | Ananya Sen | 2012-06-26 |
| |\ \ | |/ / |/| | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | | Merge pull request #340 from mencio/panel-cleanup-scroll | Valerio Virgillito | 2012-06-26 |
|\ \ \ | | | | | | | | | Panel cleanup scroll | ||
| * \ \ | Merge branch 'refs/heads/master' into panel-cleanup-scroll | Valerio Virgillito | 2012-06-26 |
| |\ \ \ | | | |/ | | |/| | |||
| * | | | removing un-necessary panel styles and possibly fix IKNINJA-1626 | Valerio Virgillito | 2012-06-26 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | Merge pull request #323 from dhg637/binding | Valerio Virgillito | 2012-06-26 |
|\ \ \ \ | | | | | | | | | | | Binding View - Binding Tool & Binding Panel | ||
| * | | | | Reverting binding.js | Armen Kesablyan | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | Binding View - Removed Debugger | Armen Kesablyan | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | Binding View - Objects Replace existing source Object if it exists | Armen Kesablyan | 2012-06-25 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | Can bind Multiple instance | Armen Kesablyan | 2012-06-25 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-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-internal | Armen Kesablyan | 2012-06-25 |
| | |\ \ \ \ | |||
| * | | | | | | Binding Panel - Changing direction in edit mode doesn't apply dirty to the ↵ | Armen Kesablyan | 2012-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 Bindings | Armen Kesablyan | 2012-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 Out | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | | Removed Console Logs | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | | Text Tool Fix - Can Not Switch Document when Text Tool Initialized | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | | Binding View - Hide when in code view | Eric Guzman | 2012-06-21 |
| | | | | | | | |||
| * | | | | | | Hintable - Remove overridden method | Eric Guzman | 2012-06-21 |
| | | | | | | | |||
| * | | | | | | Binding View :Requested Changes for Pull Request | Armen Kesablyan | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-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-internal | Armen Kesablyan | 2012-06-21 |
| | |\ \ \ \ \ | |||
| * | \ \ \ \ \ | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-21 |
| |\ \ \ \ \ \ \ | |||
| | * | | | | | | | Binding View: Hud Scroll Limit Is now 8 | Armen Kesablyan | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | | | Binding View - Minor Fixes to remove warnings | Armen Kesablyan | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | | | | Binding HUD - CSS Update | Eric Guzman | 2012-06-21 |
| | | | | | | | | | |||
| * | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| |\| | | | | | | | |||
| | * | | | | | | | Binding Panel - Fixed Panel Button | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| |\| | | | | | | | |||
| | * | | | | | | | BindingView :Montage Updates | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-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-internal | Armen Kesablyan | 2012-06-20 |
| | | |\ \ \ \ \ \ | |||
| | * | | | | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-20 |
| | |\| | | | | | | | |||
| | | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-20 |
| | | |\ \ \ \ \ \ \ | |||
| | * | | | | | | | | | Binding-View : Polish state | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | | | | | Merge branch 'refs/heads/binding_eric' into binding | Armen Kesablyan | 2012-06-20 |
| | |\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-20 |
| |\| | | | | | | | | | | | |/ / / / / / / / / | |/| | | | | | | | | | |||
| | * | | | | | | | | | binding-hud Scroll Up | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | | | | | | | Binding HUD - Show hud for "off stage" objects in tray | Eric Guzman | 2012-06-20 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | Objects Tray - Use label instead of identifier for object name | Eric Guzman | 2012-06-20 |
| | | | | |