aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\
| * Merge pull request #129 from mqg734/WebGLMaterialsValerio Virgillito2012-03-20
| |\ | | | | | | Added Montage button as a valid PI control and used it to invoke the edit material popup.
| | * Button's enabled property binding should be oneway only.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Deleting unused Materials.xml file since we converted to JSON.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * 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 branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵Jose Antonio Marquez2012-03-19
|\ \ \ | | | | | | | | | | | | FileIO-Montage-Components
| * | | fixing the selection of components. Temporary workaround for now.Valerio Virgillito2012-03-18
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Tests and clean-upJose Antonio Marquez2012-03-18
| | | |
* | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵Jose Antonio Marquez2012-03-18
|\| | | | | | | | | | | | | | | FileIO-Montage-Components
| * | | looping through both branches of the components treeValerio Virgillito2012-03-18
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | changing the picasa-carousel to use a getter and setter for the queryParameterValerio Virgillito2012-03-18
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-17
| |\ \ \ | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Youtube video is droppableFrançois Frisch2012-03-17
| | | | | | | | | | | | | | | still getting errors with the carousel
| * | | | Youtube video is droppableFrançois Frisch2012-03-17
| |/ / / | | | | | | | | | | | | | | | | | | | | still getting errors with the carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Integrating picasa carousel and youtube channelFrançois Frisch2012-03-17
| | | |
| * | | Adding back webkit-transform styles in set3DProperties. Changing "zoom" to ↵Valerio Virgillito2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | "zoomValue" in map component to avoid scaling the map. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Adding the youtube playerFrançois Frisch2012-03-17
| | | |
| * | | Added a new picasa-carousel component as well as an example using itBenoit Marchant2012-03-17
| | | |
| * | | fixing the map styles and temporary disabling the 3d styles for elements.Valerio Virgillito2012-03-17
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | adding element creation for the map and feedreader components.Valerio Virgillito2012-03-17
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Fixed snap-manager to stop snapping after first level children.Nivesh Rajbhandari2012-03-17
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Adding components to PIFrançois Frisch2012-03-17
| | | |
| * | | Deleting unecessary propertyFrançois Frisch2012-03-17
| | | |
| * | | Adding feed reader and mapFrançois Frisch2012-03-17
| | | |
| * | | Getting ownerComponent bindingsFrançois Frisch2012-03-17
| |/ /
* / / Temp I/O functionality for M-JS componentsJose Antonio Marquez2012-03-18
|/ / | | | | | | Added the ability to save montages component serialization from Ninja. Very rough, but functional.
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 11:49:38 +0000