aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | Support edit material button in oval and line PI.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | Support button control in Properties Panel and use them for edit fill and ↵Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | Fixing error in drawUtils when closing document - should set _eltArray and ↵Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _planesArray's length to 0 instead of setting the arrays to null. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | Removing zoom from element's getMatrix. Zoom should only be checked on stage.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | Use new tree control in Materials panel.Nivesh Rajbhandari2012-03-19
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Merge pull request #126 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-19
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Presets Panel - Change Tab labels, Add Un-3d preset
| | * | | | | | | | Presets Panel - Fix conflict with default transition presetsEric Guzman2012-03-17
| | | | | | | | | |
| | * | | | | | | | Merge branch 'refs/heads/master' into AddAnimationsLibraryEric Guzman2012-03-17
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/presets/default-transition-presets.js
| | * | | | | | | | Presets Panel - Change Tab labels, Add Un-3d presetEric Guzman2012-03-16
| | | | | | | | | |
| * | | | | | | | | Merge pull request #128 from mqg734/WebGLMaterialsValerio Virgillito2012-03-19
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | Replacing old button component with montage button component in our UI.
| | * | | | | | | | Replacing old button component with montage button component in our UI.Nivesh Rajbhandari2012-03-19
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Merge pull request #124 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Presets Panel - Adding Animations Tab
| | * | | | | | | Presets Panel - Adding Animations TabEric Guzman2012-03-16
| | | | | | | | |
| * | | | | | | | Squashed commit of SnapManagerFixesValerio Virgillito2012-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-16
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge pull request #122 from ananyasen/IO-patch-ninja-internal-master-ananyaValerio Virgillito2012-03-16
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | IKNINJA-1305 : fixed the check for stopVideos() method's existence
| | | * | | | | | | IKNINJA-1305 : fixed the check for stopVideos() method's existenceAnanya Sen2012-03-16
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | Merge pull request #121 from dhg637/SomethingValerio Virgillito2012-03-16
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Presets Panel: Added Scale Up and Down to transitions list. According to
| | | * | | | | | | Presets Panel: Added Scale Up and Down to transitions list. According to eric G.Armen Kesablyan2012-03-15
| | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | / | | | | | fixing the components drag and drop.Valerio Virgillito2012-03-16
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | fixing the drag and drop images to the pasteboardValerio Virgillito2012-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | Temp fix applied to all elementsJose Antonio Marquez2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be moved to 'makeNJElement' to account for the element to be loaded.
| * | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-15
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-15
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge pull request #118 from mencio/pi-fixesValerio Virgillito2012-03-15
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixed issues with Properties panel, focus and grid redraw
| | | | * \ \ \ \ \ \ Merge branch 'refs/heads/master' into pi-fixesValerio Virgillito2012-03-15
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Fixing the splitter resize canvas bug by getting the size when a document is ↵Valerio Virgillito2012-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | opened. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | | | | | | | adding a focus manager to handle panel bugs where blur was not getting ↵Valerio Virgillito2012-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called when clicking on the canvas. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | | | | | | | Removing the name attribute from the PI. Fixing the ID and Class attribute ↵Valerio Virgillito2012-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the PI Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | | | | | Merge pull request #120 from imix23ways/TimelineUberValerio Virgillito2012-03-15
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | Timeline uber
| * | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-15
| |\| | | | | | | | | |
| | * | | | | | | | | | Temp fix for element dimensions (SVG)Jose Antonio Marquez2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a temp fix to allow for a redraw of an SVG on load.
| | * | | | | | | | | | Fixing offset bug for drag-and-dropJose Antonio Marquez2012-03-15
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-15
| | |\| | | | | | | | |
| * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-15
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | |