aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)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 ↵Valerio Virgillito2012-03-20
| |\ | | | | | | | | | montage-integration
| * \ Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
| |\ \ | | | | | | | | | | | | montage-integration
| * \ \ Merge branch 'refs/heads/button-switch' into montage-integrationValerio Virgillito2012-03-20
| |\ \ \
| | * | | fully removing our old button component from NinjaValerio Virgillito2012-03-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | montage-integration
| * \ \ \ \ Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | montage-integration
| * \ \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed creating new files.
| * | | | | | | Removing usage of webRequest APIsJose Antonio Marquez2012-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the usage of the webRequest API since all files are parsed on open to handle prefixing correct origin. This will most likely not work for assets that are added dynamically and will most likely break, all those adding linking to assets should make use of a function in the mediator to mask the display value and actual value of the linked asset.
* | | | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵Jose Antonio Marquez2012-03-21
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | FileIO-Montage-Components
| * | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Eric Guzman2012-03-20
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | FeedReaderAnimation
| | * | | | | | Fixing the selection issuesValerio Virgillito2012-03-20
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * / | | | | Presets - Animation updateEric Guzman2012-03-20
| |/ / / / /
| * | | | / fixing the selection for the picasa carouselValerio Virgillito2012-03-19
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Maps - Apply default width and height styles to components if specified. ↵Nivesh Rajbhandari2012-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change default location to Sunnyvale. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | 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
| | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| * | | | | 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>
| * | | 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>
| * | | 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
| | | |
| * | | 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
|\ \
| * | IKNINJA-1305 : fixed the check for stopVideos() method's existenceAnanya Sen2012-03-16
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>