aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | * | | | 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 '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 ↵Jose Antonio Marquez2012-03-19
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * | | | | | Tests and clean-upJose Antonio Marquez2012-03-18
| | | | | | | |
| | * | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵Jose Antonio Marquez2012-03-18
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| | * | | | | | | 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 branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-21
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| | * | | | | | | | 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 ↵Valerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | montage-integration
| | * | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Eric Guzman2012-03-20
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | FeedReaderAnimation
| | * | | | | | | Presets - Animation updateEric Guzman2012-03-20
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | montage-integration
| | * | | | | | | Fixing the selection issuesValerio Virgillito2012-03-20
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | 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
| | * | | | | | | fixing the selection for the picasa carouselValerio 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
| | * | | | | | | 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>
| | * | | | | | fixing the selection of components. Temporary workaround for now.Valerio Virgillito2012-03-18
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | looping through both branches of the components treeValerio Virgillito2012-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-19
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| * | | | | 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
| | |_|/ / | |/| | |
* | | | | Adding logic for flatten checkbox in PI.Nivesh Rajbhandari2012-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires minor modifications to both StageController and ComponentController. Also removing unused global3DSettings CSS. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Tweaking some styles in the materials popup.Nivesh Rajbhandari2012-03-23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | WebGL needs to have 3d styles to render.Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | IKNinja-1368 - Moving multiple selection of 2d elements starts changing the ↵Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | objects' relative positions. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | IKNINJA-758 - The rotation value of the stage is not updated in the ↵Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properties panel. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Translation handles do not redraw at correct location when double-clicking ↵Nivesh Rajbhandari2012-03-22