aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
|\
| * Temp Gradient FixJose Antonio Marquez2012-03-09
* | updated file picker image iconsAnanya Sen2012-03-06
|/
* 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
| * | | Tool Icons : New layoutArmen Kesablyan2012-02-15
* | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-22
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-21
| |\ \ \
| | * | | cleanup of the breadcrumbValerio Virgillito2012-02-20
| | | |/ | | |/|
| * | | fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
* | | | - file picker - select file on double clickAnanya Sen2012-02-21
|/ / /
* | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
|\| |
| * | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-16
| |\ \
| | * | fixing the Text tool toggle buttonsValerio Virgillito2012-02-16
| * | | Presets - Minor CSS text-shadow work-around for Windows ChromeEric Guzman2012-02-16
| |/ /
| * | Merge pull request #45 from joseeight/FileIOValerio Virgillito2012-02-16
| |\ \
| | * | Squashed commit of the following:Jose Antonio Marquez2012-02-16
| | * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-15
| | |\ \
| * | | | Tree controller - Minor change (to use "distinct" descriptor)Eric Guzman2012-02-15
| * | | | Tree view event delegate map fixEric Guzman2012-02-15
| * | | | Ninja Leaf/Branch - Minor CSS fixesEric Guzman2012-02-15
| * | | | Tree Node - fix for applying tree child nodes array twice (and getting duplic...Eric Guzman2012-02-15
| | |/ / | |/| |
| * | | Merge branch 'components' of https://github.com/mencio/ninja-internal into in...Valerio Virgillito2012-02-14
| |\ \ \
| | * | | small changes to the tree component to allow events to be passed and add a do...Valerio Virgillito2012-02-14
| | | |/ | | |/|
| * | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into int...Valerio Virgillito2012-02-14
| |\ \ \
| | * | | Merge branch 'refs/heads/master' into text-toolArmen Kesablyan2012-02-14
| | |\| |
| | * | | Merge branch 'refs/heads/master' into text-toolArmen Kesablyan2012-02-13
| | |\ \ \
| | * | | | Fixed binding to font size dropdownArmen Kesablyan2012-02-13
| | * | | | Fixed Color on text edit. Also Fixed Indent & Outdent button. toggle bullet a...Armen Kesablyan2012-02-13
| * | | | | Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into int...Valerio Virgillito2012-02-14
| |\ \ \ \ \
* | | | | | | moved file picker in file ioAnanya Sen2012-02-16
* | | | | | | file picker:Ananya Sen2012-02-16
* | | | | | | fixes to document tabbingAnanya Sen2012-02-15