aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* 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>
| * Fixing binding of alpha slider/hottext in popup with panelJose Antonio Marquez2012-06-18
| |
| * More cleaning upJose Antonio Marquez2012-06-16
| | | | | | | | Controller will need a review and refactoring.
| * Fixed slider/hottext bindingsJose Antonio Marquez2012-06-16
| | | | | | | | Also cleaning up, however, needs much refactoring.
| * Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| | | | | | | | This should fix canvas and standard DOM elements including the root (body or template wrapper).
| * Cleaning up referencesJose Antonio Marquez2012-06-14
| | | | | | | | Still need to do more cleaning up.
| * Fix: IKNINJA-1608Jose Antonio Marquez2012-06-13
| | | | | | | | Changing icon, seems low res and improper size, should be hi-res PNG for future reference, using negative space offset to better display.
| * Clean upJose Antonio Marquez2012-06-13
| |
| * Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
| | |\
| | * | remove serializable from custom sectionValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | adding more missing properties to the serializationValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'montage-v10-integration' of ↵Valerio Virgillito2012-06-12
| | |\ \ | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-v10-integration
| | | * | montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | adding more nonexistent propertiesValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | fixing a default propertyValerio Virgillito2012-06-12
| | |/ / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | fix a typoValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Timeline: Fix document switching under Montage v.10Jon Reid2012-06-12
| | | |
| | * | fixing a timeline issueValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | adding more missing properties to the timelineValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | removing the serializable from the timeline repetition and fixing the panels ↵Valerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | currentDocument binding Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | adding more missing propertiesValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * \ \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | first iteration of adding serializable to ninja plus other changes to run ↵Valerio Virgillito2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | We need to guard against cases where some PI controls are using HottextUnit ↵Nivesh Rajbhandari2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but don't actually allow uses to change those units. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge pull request #289 from mqg734/PI_Global3dValerio Virgillito2012-06-12
| | |\ \ \ \ | | | |_|_|/ | | |/| | | IKNinja-1377 - Global rotation does not work if object is translated in z.
| | | * | | Fixing typo.Nivesh Rajbhandari2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Removing unused requires from 3d PI section.Nivesh Rajbhandari2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | IKNinja-1377 - Global rotation does not work if object is translated in z.Nivesh Rajbhandari2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge branch 'refs/heads/master' into dom-containerValerio Virgillito2012-06-11
| |\| | |
| * | | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 17:16:39 +0000