aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | | 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>
* | | | | | | | | | | Style sheet - Style updateEric Guzman2012-04-09
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-05
|\| | | | | | | | | |
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Cleanup of the components panelValerio Virgillito2012-03-26
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed to naming convention. Deleted un-used file. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | Style Sheets - More CSS tweaksEric Guzman2012-04-05
| | | | | | | | | |
* | | | | | | | | | Style Sheets - Style update for edit viewEric Guzman2012-04-05
| | | | | | | | | |
* | | | | | | | | | Rule List - Update selection to not use "_element" property.Eric Guzman2012-04-04
| | | | | | | | | |
* | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-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
| * | | | | | | | | 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)
* | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-04
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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>
* | | | | | | | | Style sheets section - Edit mode css tweaks and buttonsEric Guzman2012-04-04
| | | | | | | | |
* | | | | | | | | CSS Panel - Stylesheet edit modeEric Guzman2012-04-03
| | | | | | | | |
* | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-02
|\| | | | | | | |
| * | | | | | | | CSS Panel - Fix animation duration value updates from "infinite" to integer.Eric Guzman2012-03-29
| | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | |