aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| | * | | Merge branch 'refs/heads/montage-integration' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
| | |\ \ \
| | * \ \ \ 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 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| * | | | | | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integrationValerio Virgillito2012-03-21
| |\| | | | |
| | * | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-19
| | |\ \ \ \ \
| | * | | | | | Tests and clean-upJose Antonio Marquez2012-03-18
| | * | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-18
| | |\ \ \ \ \ \
| | * | | | | | | Temp I/O functionality for M-JS componentsJose Antonio Marquez2012-03-18
| * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-21
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Presets Panel - Add Font style presetEric Guzman2012-03-21
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-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 FeedRe...Eric Guzman2012-03-20
| | |\ \ \ \ \ \
| | * | | | | | | Presets - Animation updateEric Guzman2012-03-20
| * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Fixing the selection issuesValerio 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
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | fixing the selection for the picasa carouselValerio Virgillito2012-03-19
| * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
| |\| | | | | | |
| | * | | | | | | Maps - Apply default width and height styles to components if specified. Chan...Nivesh Rajbhandari2012-03-19
| | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | fixing the selection of components. Temporary workaround for now.Valerio Virgillito2012-03-18
| | | |_|_|/ / | | |/| | | |
| | * | | | | looping through both branches of the components treeValerio Virgillito2012-03-18
| * | | | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-19
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| * | | | | 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
| | |_|/ / | |/| | |
* | | | | textureshwc4872012-03-23
* | | | | textureshwc4872012-03-23
* | | | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into Text...hwc4872012-03-22
|\ \ \ \ \
| * | | | | Added Paris and Raiders materialshwc4872012-03-22
| * | | | | Synchronized material animation speed for pulse material between Ninja and ru...hwc4872012-03-21
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-03-21
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Added material library data to the canvas data.hwc4872012-03-21
| * | | | | Clear RDGE when an element is deleted and before registering the context.hwc4872012-03-21
| * | | | | Bug Fixes for Canvas & WebGL File IOhwc4872012-03-20
| * | | | | removing dead codehwc4872012-03-16
| * | | | | Supporting new and old GL data formats.hwc4872012-03-16
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-03-16
| |\ \ \ \ \
| * | | | | | Conversion to JSON based file IO for canvas2D and WebGL renderinghwc4872012-03-16