aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
* | | | | | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-19
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | 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>
* | | | | | | 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
|/ / / / / /
* | | | | | 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>
| * | | | | Merge pull request #121 from dhg637/SomethingValerio Virgillito2012-03-16
| |\ \ \ \ \ | | | | | | | | | | | | | | Presets Panel: Added Scale Up and Down to transitions list. According to
| | * | | | | Presets Panel: Added Scale Up and Down to transitions list. According to eric G.Armen Kesablyan2012-03-15
| | | |/ / / | | |/| | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | / | | | fixing the components drag and drop.Valerio Virgillito2012-03-16
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | fixing the drag and drop images to the pasteboardValerio Virgillito2012-03-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Temp fix applied to all elementsJose Antonio Marquez2012-03-15
| | | | | | | | | | | | | | | | | | | | This should be moved to 'makeNJElement' to account for the element to be loaded.
* | | | | 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
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Fixed issues with Properties panel, focus and grid redraw
| | | * \ \ \ \ Merge branch 'refs/heads/master' into pi-fixesValerio Virgillito2012-03-15
| | | |\ \ \ \ \
| | | * | | | | | Fixing the splitter resize canvas bug by getting the size when a document is ↵Valerio Virgillito2012-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | opened. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | | adding a focus manager to handle panel bugs where blur was not getting ↵Valerio Virgillito2012-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called when clicking on the canvas. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | | Removing the name attribute from the PI. Fixing the ID and Class attribute ↵Valerio Virgillito2012-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the PI Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | Timeline: remove comment.Jonathan Duran2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | Timeline: Fix for layer selection problems on file open and switch.Jonathan Duran2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | revert spaceJonathan Duran2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-15
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/helper-classes/backup-delete/GLBrushStroke.js js/helper-classes/backup-delete/GLCircle.js js/helper-classes/backup-delete/GLGeomObj.js js/helper-classes/backup-delete/GLRectangle.js js/helper-classes/backup-delete/GLSubpath.js js/helper-classes/backup-delete/GLWorld.js js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js js/helper-classes/backup-delete/Materials/DeformMaterial.js js/helper-classes/backup-delete/Materials/FlatMaterial.js js/helper-classes/backup-delete/Materials/FlyMaterial.js js/helper-classes/backup-delete/Materials/JuliaMaterial.js js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js js/helper-classes/backup-delete/Materials/MandelMaterial.js js/helper-classes/backup-delete/Materials/PlasmaMaterial.js js/helper-classes/backup-delete/Materials/PulseMaterial.js js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js j