aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/montage-integration' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\
| * Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
| |\
| * \ Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
| |\ \
| * \ \ Merge branch 'refs/heads/button-switch' into montage-integrationValerio Virgillito2012-03-20
| |\ \ \
| | * | | fully removing our old button component from NinjaValerio Virgillito2012-03-19
| * | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-19
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
* | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\ \ \ \ \ \ \
| * | | | | | | Fix: Chrome 19 I/O BugJose Antonio Marquez2012-03-21
| * | | | | | | Removing usage of webRequest APIsJose Antonio Marquez2012-03-21
* | | | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-21
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into FeedRe...Eric Guzman2012-03-20
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Fixing the selection issuesValerio Virgillito2012-03-20
| | | |_|_|_|/ | | |/| | | |
| * / | | | | Presets - Animation updateEric Guzman2012-03-20
| |/ / / / /
| * | | | / fixing the selection for the picasa carouselValerio Virgillito2012-03-19
| | |_|_|/ | |/| | |
| * | | | Maps - Apply default width and height styles to components if specified. Chan...Nivesh Rajbhandari2012-03-19
* | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
| * | | | | 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
| | |_|/ | |/| |
| * | | 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
| * | | 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
| * | | 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
|\ \
| * | IKNINJA-1305 : fixed the check for stopVideos() method's existenceAnanya Sen2012-03-16