aboutsummaryrefslogtreecommitdiff
Commit message (Expand)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
| |\
| | * Button's enabled property binding should be oneway only.Nivesh Rajbhandari2012-03-20
| | * Deleting unused Materials.xml file since we converted to JSON.Nivesh Rajbhandari2012-03-20
| | * Support edit material button in oval and line PI.Nivesh Rajbhandari2012-03-20
| | * Support button control in Properties Panel and use them for edit fill and str...Nivesh Rajbhandari2012-03-20
| | * Fixing error in drawUtils when closing document - should set _eltArray and _p...Nivesh Rajbhandari2012-03-20
| | * Removing zoom from element's getMatrix. Zoom should only be checked on stage.Nivesh Rajbhandari2012-03-20
| | * Use new tree control in Materials panel.Nivesh Rajbhandari2012-03-19
| |/
| * Merge pull request #126 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-19
| |\
| | * Presets Panel - Fix conflict with default transition presetsEric Guzman2012-03-17
| | * Merge branch 'refs/heads/master' into AddAnimationsLibraryEric Guzman2012-03-17
| | |\
| | * | 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.Nivesh Rajbhandari2012-03-19
| |/ /
* | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-19
|\ \ \
| * | | fixing the selection of components. Temporary workaround for now.Valerio Virgillito2012-03-18
* | | | Tests and clean-upJose Antonio Marquez2012-03-18
* | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-18
|\| | |
| * | | looping through both branches of the components treeValerio Virgillito2012-03-18
| * | | changing the picasa-carousel to use a getter and setter for the queryParameterValerio Virgillito2012-03-18
| * | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-17
| |\ \ \
| | * | | Youtube video is droppableFrançois Frisch2012-03-17
| * | | | Youtube video is droppableFrançois Frisch2012-03-17
| |/ / /
| * | | Integrating picasa carousel and youtube channelFrançois Frisch2012-03-17
| * | | Adding back webkit-transform styles in set3DProperties. Changing "zoom" to "z...Valerio Virgillito2012-03-17
| * | | 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
| * | | adding element creation for the map and feedreader components.Valerio Virgillito2012-03-17
| * | | Fixed snap-manager to stop snapping after first level children.Nivesh Rajbhandari2012-03-17
| * | | 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
|/ /
* | Merge pull request #124 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-16
|\|
| * Presets Panel - Adding Animations TabEric Guzman2012-03-16
* | Squashed commit of SnapManagerFixesValerio Virgillito2012-03-16
* | 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 existenceAnanya Sen2012-03-16
| |/ /
| * | Merge pull request #121 from dhg637/SomethingValerio Virgillito2012-03-16
| |\ \
| | * | Presets Panel: Added Scale Up and Down to transitions list. According to eric G.Armen Kesablyan2012-03-15
* | | | fixing the components drag and drop.Valerio Virgillito2012-03-16
|/ / /
* | | fixing the drag and drop images to the pasteboardValerio Virgillito2012-03-16
* | | Temp fix applied to all elementsJose Antonio Marquez2012-03-15
* | | 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
| | |\ \ \