aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | 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.
| * | | | | | removing console logValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | 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>
* | | | | | Remove obsolete absolute/relative options from timeline config menuJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Hide timeline zoom slider temporarilyJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | remove console logsJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Fix sub prop re-open for tweensJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | F6 support for keyframesJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | Timeline: fix serialization error.Jon Reid2012-06-14
| | | | | |
* | | | | | Timeline: New easing menu.Jon Reid2012-06-14
| | | | | |
* | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into new-easing-menuJon Reid2012-06-14
|\ \ \ \ \ \
| * | | | | | Fix the broken animationKruti Shah2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | Timeline: More work on new easing menu.Jon Reid2012-06-13
| | | | | | |
* | | | | | | Timeline: New popup menu for easing choices.Jon Reid2012-06-12
|/ / / / / /
* | | | | | Clean upKruti Shah2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | remove unneeded serializationJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | montage v10 serialization updates for timelineJonathan Duran2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |