aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Integrating Materials UI changes. Squashed commit of the following:Nivesh Rajbhandari2012-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 89ccb55130e67c4516e616ccc56d2a649a2b9160 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jun 27 14:20:01 2012 -0700 Position Materials Editor popup and change buttons' text color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 89bca82adc781f4913f8d302a49a8baa907631c5 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jun 27 12:00:51 2012 -0700 Support deleting and editing custom materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 5be5160c4786beb70e8ad4d75562adb135718c6c Merge: 1d9d9f6 2ebf3e3 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jun 27 11:11:37 2012 -0700 Merge branch 'refs/heads/ninja-internal' into WebGLMaterials Conflicts: js/data/panels-data.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 1d9d9f6e66ea7585f07ed461cebba99e71f65de0 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jun 26 22:01:22 2012 -0700 "Save as" support to duplicate material with modified settings. Also removed Add button and disabled Reset button for now. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit bf1037508dbc686f2884765344832f906cbf06d0 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jun 26 17:23:31 2012 -0700 Added UI for duplicating and deleting materials in the Materials Library. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 54930792f9c417df5f739831164aa1f96a41d67a Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jun 26 14:29:17 2012 -0700 Added preview of material in materials editor popup and fixed some styling. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Styles Controller - Chrome 20 FixEric Guzman2012-06-26
|
* Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
|\ | | | | Binding View - Binding Tool & Binding Panel
| * 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>
| * | 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>
| * | 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>
| * | | Binding View - Minor Fixes to remove warningsArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Binding Panel - Fixed Panel ButtonArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | 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 'refs/heads/master' into bindingArmen Kesablyan2012-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 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | Edit Binding View - Improve how form is populated, cleared, and saved.Eric Guzman2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleaned up some logs.
| * | | | | | Edit View - Minor cleanupEric Guzman2012-06-18
| | | | | | |
| * | | | | | Binding panel - Minor change on add button handlerEric Guzman2012-06-18
| | | | | | |
| * | | | | | Edit Binding View - Handle no object for iconEric Guzman2012-06-18
| | | | | | |
| * | | | | | Binding - Show tray when there are objects. Edit binding view css update.Eric Guzman2012-06-18
| | | | | | |
| * | | | | | Objects Panel - removed for nowEric Guzman2012-06-15
| | | | | | |
| * | | | | | Objects Tray - Add objects tray to binding viewEric Guzman2012-06-15
| | | | | | |
| * | | | | | Edit Binding - Binding improvements to show icon and save formEric Guzman2012-06-13
| | | | | | |
| * | | | | | Objects Panel - Fix CSS to simplify showing object icons in other panelsEric Guzman2012-06-13
| | | | | | |
| * | | | | | Binding Panel - Dock the edit view when transition ends so horizontal ↵Eric Guzman2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | resizing works
| * | | | | | Edit Binding - Update LayoutEric Guzman2012-06-13
| | | | | | |
| * | | | | | Binding Panel - set up new edit view layoutEric Guzman2012-06-12
| | | | | | |
| * | | | | | Components - Add object instance to model's objects arrayEric Guzman2012-06-12
| | | | | | |
| * | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-11
| |\ \ \ \ \ \
| | * | | | | | Changes Made to Object Listing of iFrameArmen Kesablyan2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | Objects Panel - CSS and serialization updateEric Guzman2012-06-11
| | | | | | | | |
| * | | | | | | | Objects Panel - Add component icon and icons by typeEric Guzman2012-06-11
| |/ / / / / / /
| * | | | | | | Binding Panel - fix scrollbar issue with abs positioned edit view.Eric Guzman2012-06-11
| | | | | | | |
| * | | | | | | Edit View - Add buttons and calls controller (saves bindings)Eric Guzman2012-06-11
| | | | | | | |
| * | | | | | | Binding Item - Direction Toggle button calls controllerEric Guzman2012-06-11
| | | | | | | |
| * | | | | | | Binding Panel - Direction toggle changes are savable.Eric Guzman2012-06-10
| | | | | | | |
| * | | | | | | Binding Panel - Minor Editing Panel changesEric Guzman2012-06-10
| | | | | | | |
| * | | | | | | Binding Panel Toolbar - Add action handlerEric Guzman2012-06-10
| | | | | | | |
| * | | | | | | Binding Panel - supply binding args to edit viewEric Guzman2012-06-08
| | | | | | | |
| * | | | | | | Binding Panel - Add toolbarEric Guzman2012-06-08
| | | | | | | |
| * | | | | | | Binding Panel - Update edit view - populate binding argumentsEric Guzman2012-06-08
| | | | | | | |
| * | | | | | | Binding Panel - Add getPropertyList and fix null currentObjectEric Guzman2012-06-05
| | | | | | | |
| * | | | | | | Binding Panel - Add edit viewEric Guzman2012-06-04
| | | | | | | |
| * | | | | | | Binding Panel - Button CSSEric Guzman2012-06-02
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 23:33:30 +0000