aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
|\
| * cleanup unused code.Valerio Virgillito2012-04-19
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | more backup fixes for the old stageValerio Virgillito2012-04-20
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | initial stage web templateValerio Virgillito2012-04-18
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Squashed commit of the following:Valerio Virgillito2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 2054551bfb01a0f4ca2e138b9d724835462d45cd Merge: 765c2da 616a853 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 18 13:48:21 2012 -0700 Merge branch 'refs/heads/master' into integration commit 765c2da8e1aa03550caf42b2bd5f367555ad2843 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:29:41 2012 -0700 updating the picasa carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406 Merge: d27f2df cacb4a2 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:03:50 2012 -0700 Merge branch 'refs/heads/master' into integration commit d27f2df4d846064444263d7832d213535962abe7 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 11 10:39:36 2012 -0700 integrating new picasa carousel component Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 10 14:33:00 2012 -0700 fixed the text area case issue Text area was renamed from TextArea to Textarea Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 1e83e26652266136802bc7af930379c1ecd631a6 Author: Valerio Virgillito <valerio@motorola.com> Date: Mon Apr 9 22:10:45 2012 -0700 integrating montage v0.8 into ninja. Signed-off-by: Valerio Virgillito <valerio@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge pull request #165 from mqg734/BoundsCalculationValerio Virgillito2012-04-17
|\ | | | | Drag and drop of images and components should not add 3d values by default
| * Drag and drop of images and components should not add 3d values by default.Nivesh Rajbhandari2012-04-16
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | collapsing the history panel by default and commenting out the undo for the ↵Valerio Virgillito2012-04-13
| | | | | | | | | | | | 3d properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | setAttribute added to the undo/redoValerio Virgillito2012-04-09
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | adding a history panelValerio Virgillito2012-04-09
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
|\ | | | | 3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes.
| * Undoing bad auto-merge resize-composer.js.Nivesh Rajbhandari2012-04-05
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Undoing some minor spacing differences from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * Merge branch 'refs/heads/EricSnapping' into WebGLFileIONivesh Rajbhandari2012-04-04
| | | |\
| | | | * merge from mainhwc4872012-03-29
| | | | |
| | * | | Styling PI's Materials edit button.Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | 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>
| * | | | | 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>
* | | | | | fixing the number fields to not have units.Valerio Virgillito2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #149 from dhg637/BugFixesValerio Virgillito2012-04-04
| |\ \ \ \ \ | | | | | | | | | | | | | | Bug fixes
| | * \ \ \ \ Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
| | |\ \ \ \ \
| | * | | | | | Resizing BugsArmen Kesablyan2012-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Bug #1073: Panels interact with hottest drag dropArmen Kesablyan2012-03-28
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: js/controllers/presets-controller.js
| | * | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | CSS Panel - Fix animation duration value updates from "infinite" to integer.Eric Guzman2012-03-29
| | |/ / /
| * | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| |\| | |
| * | | | Presets - Remove style transition when transition doesn't start. Also added ↵Eric Guzman2012-03-29
| | | | | | | | | | | | | | | | | | | | temporary fix for aggregating animations (from timeline/presets)
* | | | | completing the component simple piValerio Virgillito2012-03-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Components now appear in alphabetical order. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #145 from ericguzman/PresetsPIValerio Virgillito2012-03-28
| |\| | | | | | | | | | | | | Presets - Adding presets controller
| | * | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Presets Panel - Adding presets controller and removing functionality from ↵Eric Guzman2012-03-22
| | | |/ | | |/| | | | | | | | | panel code
| * | | Merge pull request #139 from dhg637/ResizersRefactoringValerio Virgillito2012-03-28
| |\ \ \ | | |_|/ | |/| | Resizers refactoring
| | * | Resizers updatedArmen Kesablyan2012-03-23
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Merge branch 'refs/heads/master' into DataBindingArmen Kesablyan2012-03-22
| | |\|
| | * | Updated Resizers for Panels and timelineArmen Kesablyan2012-03-22
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Cleanup of the components panelValerio Virgillito2012-03-26
|/ / / | | | | | | | | | | | | | | | Renamed to naming convention. Deleted un-used file. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge pull request #142 from joseeight/ColorValerio Virgillito2012-03-26
|\ \ \ | | | | | | | | Color Bug Fix
| * | | Fix: IKNINJA-1362Jose Antonio Marquez2012-03-26
| | |/ | |/|
* | | Merge pull request #138 from joseeight/FileIO-Montage-ComponentsValerio Virgillito2012-03-23
|\ \ \ | | | | | | | | I/O Fixes
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 06:22:43 +0000