aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
...
| | * | | | | | | 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
| | * | | | | | 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>
| | * | | | | | 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
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | 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 element creation for the map and feedreader components.Valerio Virgillito2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Adding components to PIFrançois Frisch2012-03-17
| |/ / / / /
* | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-19
|\| | | | |
| * | | | | Merge pull request #124 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-16
| |\| | | | | | | | | | | | | | | | Presets Panel - Adding Animations Tab
| | * | | | Presets Panel - Adding Animations TabEric Guzman2012-03-16
| | | | | |
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-16
| |\ \ \ \ \
| * | | | | | fixing the components drag and drop.Valerio Virgillito2012-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-16
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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>
| * | | | | | 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>
| * | | | | 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 js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js js/helper-classes/backup-delete/Materials/StarMaterial.js js/helper-classes/backup-delete/Materials/TaperMaterial.js js/helper-classes/backup-delete/Materials/TunnelMaterial.js js/helper-classes/backup-delete/Materials/TwistMaterial.js js/helper-classes/backup-delete/Materials/TwistVertMaterial.js js/helper-classes/backup-delete/Materials/UberMaterial.js js/helper-classes/backup-delete/Materials/WaterMaterial.js js/helper-classes/backup-delete/Materials/ZInvertMaterial.js js/lib/drawing/world.js js/preloader/Preloader.js js/stage/layout.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | Merge pull request #116 from joseeight/ColorValerio Virgillito2012-03-14
| | |\ \ \ \ | | | |/ / / | | |/| | | Temp Fix for: IKNINJA-1078
| | | * | | Temp Fix for: IKNINJA-1078Jose Antonio Marquez2012-03-13
| | | | | |
| * | | | | Fix element delete causes keyframe addition failJonathan Duran2012-03-15
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Optimize Tween component needsDraw callsJonathan Duran2012-03-14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | Squashed commit of the following:Jonathan Duran2012-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge master into timeline Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | CSS Panel Updates - CSS tweaks and cleanupEric Guzman2012-03-16
| | | | |
* | | | | CSS Panel Updates - Added shorthand collapserEric Guzman2012-03-14
| | | | |
* | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-14
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fixing the layout to only draw one level and stage resize when the panels ↵Valerio Virgillito2012-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |