aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| * | | | | | 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>
| * | | | | | | | adding the latest v0.10 montageValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #291 from joseeight/TempPromptUIValerio Virgillito2012-06-13
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | Adding temp prompts
| | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into TempPromptUIJose Antonio Marquez2012-06-12
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | 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.
| | * | | | | | | Adding close Ninja promptJose Antonio Marquez2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a prompt to the user to ensure all data is saved prior to closing the application. This will not let me check for documents to need saving, so it must be general and will appear at all times.
| * | | | | | | | Merge pull request #290 from pushkarjoshi/brushtoolValerio Virgillito2012-06-12
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | Brushtool
| | * | | | | | ignore hardness for calligraphic brushes if stroke width is 1Pushkar Joshi2012-06-12
| | | | | | | |
| | * | | | | | correct mouse cursor on mousemovePushkar Joshi2012-06-12
| | | | | | | |
| | * | | | | | allow the addition of anchor points to a closed path (the mouse move cursor ↵Pushkar Joshi2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still needs to be updated)
| | * | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-06-12
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-11
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | fix the brush tool runtime: update the brush coordinates to account for ↵Pushkar Joshi2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change in bounding box due to smoothing
| * | | | | | | Merge pull request #299 from mqg734/GIO_FixesValerio Virgillito2012-06-12
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | IKNINJA-1675 - Cannot resize SVG using free transform tool.
| | * | | | | | IKNINJA-1675 - Cannot resize SVG using free transform tool.Nivesh Rajbhandari2012-06-12
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | 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
|\| | | |
| * | | | Merge pull request #286 from mqg734/ScrollBarFixValerio Virgillito2012-06-11
| |\ \ \ \ | | | | | | | | | | | | Overriding scrollbar styles on the template so the scroll track is not white.
| | * \ \ \ Merge branch 'refs/heads/ninja-internal' into ScrollBarFixNivesh Rajbhandari2012-06-08
| | |\ \ \ \
| | * | | | | Overriding scrollbar styles on the template so the scroll track is not ↵Nivesh Rajbhandari2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | white. This has the side benefit of fixing some of the zoom issues with the scrollbar too. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Re-adding temp doc typeJose Antonio Marquez2012-06-09
| | |/ / / / | |/| | | | | | | | | | | | | | | | Adding a demo fix to include the document type, it is removed because comments are not supported currently, so we must added in manually. The YouTube component breaks, it does not support any doctype, hence, the component must have a bug filed against it, we MUST include doc types with our files.
| * | | | | Merge pull request #285 from joseeight/FileIOValerio Virgillito2012-06-08
| |\ \ \ \ \ | | | | | | | | | | | | | | Remove doc type from files and adding tag check for html
| | * | | | | Remove doc type from files and adding tag check for htmlJose Antonio Marquez2012-06-08
| | |/ / / / | | | | | | | | | | | | | | | | | | Removed the HTML5 doctype from files since it was break the YouTube component, also made a fix to check for the HTML tag to be present when copying attributes.
| * | | | | Merge pull request #284 from mencio/timeline-resizer-fixValerio Virgillito2012-06-08
| |\ \ \ \ \ | | | | | | | | | | | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error
| | * | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2Valerio Virgillito2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | Merge branch 'refs/heads/master' into timeline-resizer-fixValerio Virgillito2012-06-08
| | |\| | | |
| | * | | | | IKNINJA-1702: Fix the timeline resized throwing a debugger errorValerio Virgillito2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Merge pull request #280 from pushkarjoshi/brushtoolValerio Virgillito2012-06-08
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | | Brushtool
| | * | | | change units for smoothing and calligraphic angle in PIPushkar Joshi2012-06-07
| | | | | |
| | * | | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-07
| | |\ \ \ \
| | * | | | | change the PI to make it look like the fill color affects the brush stroke colorPushkar Joshi2012-06-07
| | | | | | |
|