aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
* Merge branch 'master' into pentoolPushkar Joshi2012-04-17
|\
| * Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| |\
| * | IKNINJA-764 - The Local/Global options are not in synced with both 3D object ...Nivesh Rajbhandari2012-03-27
| * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| |\ \
| * | | Tweaking some styles in the materials popup.Nivesh Rajbhandari2012-03-23
* | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-04
|\ \ \ \ | | |_|/ | |/| |
| * | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
* | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-03
|\| | |
| * | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ \
| * \ \ \ Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
| |\ \ \ \
| | * | | | fixed logical error in triggering menu itemAnanya Sen2012-03-26
| | * | | | - removed menu-data boundObj path support for nowAnanya Sen2012-03-22
| | * | | | IKNINJA-1364 : fixed css so that white spaces are not collapsed while renderingAnanya Sen2012-03-22
| | * | | | file picker - added size unitAnanya Sen2012-03-22
| | * | | | IKNINJA-1266 : restrict tab size for long file names and resize tabs on windo...Ananya Sen2012-03-22
| | * | | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents openAnanya Sen2012-03-22
| | | |/ / | | |/| |
* | | | | render the pen path with local coordinates, but use stage world coordinates t...Pushkar Joshi2012-04-02
| |_|/ / |/| | |
* | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
|\| | |
| * | | Merge pull request #139 from dhg637/ResizersRefactoringValerio Virgillito2012-03-28
| |\ \ \ | | |_|/ | |/| |
| | * | Resizers updatedArmen Kesablyan2012-03-23
| | |/
| | * Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananyaValerio Virgillito2012-03-21
| | |\
| | | * fix for IKNINJA-1357 - Cannot create other file types such as css, json from ...Ananya Sen2012-03-16
* | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
|\| | |
| * | | Merge pull request #134 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
| |\ \ \
| | * | | Adding enabled/disabled support for PI's checkbox control.Nivesh Rajbhandari2012-03-22
| | * | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| * | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| |/ / /
| * | | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| * | | Fixed the lock button for the shape properties barValerio Virgillito2012-03-22
| * | | fully removing our old button component from NinjaValerio Virgillito2012-03-19
| |/ /
| * / Replacing old button component with montage button component in our UI.Nivesh Rajbhandari2012-03-19
| |/
* | Merge branch 'master' into brushtoolPushkar Joshi2012-03-16
|\|
| * adding a focus manager to handle panel bugs where blur was not getting called...Valerio Virgillito2012-03-14
* | Merge branch 'master' into pentoolPushkar Joshi2012-03-14
|\|
| * Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| * Merge pull request #112 from ericguzman/PresetsPanelValerio Virgillito2012-03-13
| |\
| | * Presets Panel - Remove :active pseudo class from ninja-leafEric Guzman2012-03-13
| | * Presets Panel - Add :active pseudo class for ninja-treeEric Guzman2012-03-13
| | * Presets Panel - Adding hover state to ninja-leafEric Guzman2012-03-13
| * | Gradient stop logicJose Antonio Marquez2012-03-13
* | | PI for pen and brush strokesPushkar Joshi2012-03-14
* | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-13
|\| |
| * | Merge pull request #108 from pushkarjoshi/brushtoolValerio Virgillito2012-03-13
| |\ \
| * \ \ Merge pull request #105 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-13
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
| | |\ \
| | * | | updated file picker image iconsAnanya Sen2012-03-06
| * | | | Merge dhg637 DisabledState into master.Valerio Virgillito2012-03-12
| * | | | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumbArmen Kesablyan2012-03-12
| | |/ / | |/| |
* | | | Add a smoothing amount parameter, and hide options based on checkboxesPushkar Joshi2012-03-13
* | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-12
|\| | | | |_|/ |/| |