aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
* 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
| |\
| | * fixing the css panel button hoverValerio Virgillito2012-06-20
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | fixing the css bugs with montage v11Valerio Virgillito2012-06-18
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-18
| | |\ \
| | * | | updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
|\| | | |
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'IKNINJA-1754' of github.com:mencio/ninja-internalValerio Virgillito2012-06-19
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/menu/menu-entry.reel/menu-entry.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | IKNINJA 1754 menu not opening on hoverValerio Virgillito2012-06-19
| | | | |/ | | | |/| | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internalValerio Virgillito2012-06-19
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Reverting last change since this is is being made in a different pull request.Ananya Sen2012-06-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main ↵Ananya Sen2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | menu does not work when a main menu drop down is already displayed. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ↵Ananya Sen2012-06-18
| | | |/ | | | | | | | | | | | | | | | | | | | | is opened Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | 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>
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-19
| |\| |
| | * | Cleaning reelJose Antonio Marquez2012-06-17
| | | |
| | * | Cleaning up element referencesJose Antonio Marquez2012-06-17
| | | |
| | * | Tidying up color barJose Antonio Marquez2012-06-17
| | |/
| | * Fix: IKNINJA-1187Jose Antonio Marquez2012-06-13
| | | | | | | | | | | | Clean up and fixing masking of color wheel.
| | * Merge branch 'refs/heads/Ninja-Internal' into ColorJose 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-13
| | | | |\
| | | | * | fixed document switching issuesValerio 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>
| | | | * | adding more missing propertiesValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | adding more missing propertiesValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | removing serializable to the tree and adding a few 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>
| | | * | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Cleaning up color wheel componentJose Antonio Marquez2012-06-13
| | | |/ / / | | |/| | | | | | | | | | | | | | | Minor code clean up and refactoring.
| | * | | | Merge branch 'refs/heads/Ninja-Internal' into TempPromptUIJose Antonio Marquez2012-06-12
| | |\| | |
| | | * | | 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>
| | * | | | Adding temp prompt UI componentJose Antonio Marquez2012-06-11
| | |/ / / | | | | | | | | | | | | | | | Added a temp prompt component and added on before close logic to ensure user does not lose data if the file needs saving when they close.
* | | | | Hintable - Fix editable/hintable value property so it is bindable.Eric Guzman2012-06-18
| | | | |
* | | | | 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>
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-11
| |\| | |
| | * | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * \ \ Merge pull request #272 from pushkarjoshi/pentoolValerio Virgillito2012-06-06
| | | |\ \ \ | | | | |_|/ | | | |/| | Pentool
| | | | * | Merge branch 'master' into pentoolPushkar Joshi2012-06-04
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js
| | | | * | Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| | | | |\ \
| | | | * | | More consistent local and global mouse coords which solves a bug with the ↵Pushkar Joshi2012-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pen minus subtool not removing 1 anchor paths
| | | | * | | allow changes in the pen subtool in options to be seen by the pen tool code ↵Pushkar Joshi2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | |</