aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-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
* | Tweaking some styles in the materials popup.Nivesh Rajbhandari2012-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
* | Replacing old button component with montage button component in our UI.Nivesh Rajbhandari2012-03-19
|/
* adding a focus manager to handle panel bugs where blur was not getting called...Valerio Virgillito2012-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
* | Merge pull request #108 from pushkarjoshi/brushtoolValerio Virgillito2012-03-13
|\ \
| * | bug fixes for spline interpolationPushkar Joshi2012-03-12
| * | brush stroke options for calligraphic brush stylePushkar Joshi2012-03-08
| * | implement stroke hardness such that it is percentage of the stroke width that...Pushkar Joshi2012-03-07
| * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-02
| |\ \
| * | | Catmull-Rom spline sampling for the brush stroke, and options for stroke size...Pushkar Joshi2012-03-02
* | | | 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
| |/ / |/| |
* | | Temp Gradient FixJose Antonio Marquez2012-03-09
|/ /
* | Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into i...Valerio Virgillito2012-02-29
|\ \
| * | We need to remove color buttons from the color model when updating the PI for...Nivesh Rajbhandari2012-02-28
| |/
* | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-28
|\ \ | |/ |/|
| * adding some margin to the bread crumb buttonsValerio Virgillito2012-02-28
| * cleanup and fixing selecting each bread crumbValerio Virgillito2012-02-28
| * breadcrumb cleanup and moving the resized on top of the timeline panelValerio Virgillito2012-02-27
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
|\|
| * Adding some missing copyrightsValerio Virgillito2012-02-24
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\|
| * Fixing the breadcrumb button - removing toolbutton class since it is not a to...Valerio Virgillito2012-02-23
| * Updating textfield to only use nj-skinned class and updating input-group to c...Nivesh Rajbhandari2012-02-22
| * Buttons in the rectangle properties in the tools options need to float left.Nivesh Rajbhandari2012-02-22
| * Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\
| * \ Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\ \
| * | | Updated Materials Library and Materials Editor Popup to work with latest vers...mqg7342012-02-21
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-22
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
| |\ \ \ | | | |/ | | |/|
| * | | Tool Button FixesArmen Kesablyan2012-02-16
| * | | New Icons: Last set had imperfectionsArmen Kesablyan2012-02-15