aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
* 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/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/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-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
| * | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
| |\| |
| * | | moved file picker in file ioAnanya Sen2012-02-16
| * | | file picker:Ananya Sen2012-02-16
| * | | fixes to document tabbingAnanya Sen2012-02-15
| * | | Revert "Revert "Reverting text/html document classes and setting up MVC folde...Ananya Sen2012-02-15
| * | | Revert "Reverting text/html document classes and setting up MVC folder struct...Ananya Sen2012-02-15
* | | | Updated Materials Library and Materials Editor Popup to work with latest vers...mqg7342012-02-21
| |/ / |/| |
* | | 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
| |\ \ \ | | |/ / | |/| |
| * | | Reverting text/html document classes and setting up MVC folder structureJose Antonio Marquez2012-02-14
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-14
| |\ \ \
* | | | | 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
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | File IO UI tweaksJose Antonio Marquez2012-02-13
| * | | | new file dialog - preselect default templateAnanya Sen2012-02-13
| * | | | added logical drive selection to file pickerAnanya Sen2012-02-13
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | file open and file new integrated againAnanya Sen2012-02-10
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
| |\ \ \ \ \ \
| * | | | | | | fixed templates descriptor, changed validation to on key up, fixed minor ui i...Ananya Sen2012-02-09
| * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-08
| |\ \ \ \ \ \ \ \