aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NinjaInternal' into ColorJose 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
| * Adding back the local storage check in the cloudpopup.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/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\ \
| | * | Removing unused method that was using snapManager.Nivesh Rajbhandari2012-02-22
| | * | Integrating Zoom tool fixes.Nivesh Rajbhandari2012-02-22
| | * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-22
| | |\ \
| | * | | Fixing eyedropper tool to get color from image data. This required us to work...Nivesh Rajbhandari2012-02-22
| | * | | Some more tweaks to not being able to select elements in top/side view.Nivesh Rajbhandari2012-02-20
| * | | | PulseMaterial and RadialBlurMaterial had typos in their import code.Nivesh Rajbhandari2012-02-22
| * | | | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.Nivesh Rajbhandari2012-02-22
| * | | | Do not use color object for stage's border since we don't allow users to modi...Nivesh Rajbhandari2012-02-22
| * | | | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ...Nivesh Rajbhandari2012-02-22
| * | | | Color chips expect a color object, not a css value.Nivesh Rajbhandari2012-02-22
| * | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ma...Nivesh Rajbhandari2012-02-22
| * | | | Updated Materials Library and Materials Editor Popup to work with latest vers...mqg7342012-02-21
| | |/ / | |/| |
| * | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
| |\ \ \
| * | | | Fix for not being able to select an element in Top/Side view.Nivesh Rajbhandari2012-02-14
| * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \ \ \
| * | | | | Get color under mouse point from image or canvas.Nivesh Rajbhandari2012-02-14
| * | | | | Get color from canvas and images.Nivesh Rajbhandari2012-02-14
| * | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \ \ \ \
| * | | | | | Check if eyedropper is over border or background.Nivesh Rajbhandari2012-02-13
| * | | | | | Fixed issue with tools not drawing their handles when mousing up.Nivesh Rajbhandari2012-02-13
| * | | | | | Working around inconsistent color object when getting/setting WebGL values.Nivesh Rajbhandari2012-02-13
| * | | | | | Fixed eyedropper tool to use new color routines.Nivesh Rajbhandari2012-02-13
| * | | | | | Updated ink bottle tool to use new setColor routine in the mediator and contr...Nivesh Rajbhandari2012-02-13
* | | | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-22
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
| |\ \ \ \ \ \
| | * | | | | | Fix for bug that keeps Ninja from launching over HTTP. We need to wrap any ex...John Mayhew2012-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/NinjaInternal' into ColorJose Antonio Marquez2012-02-21
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | user document main reel listener moved to the html-document class.Valerio Virgillito2012-02-21
| * | | | | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-21
| |\ \ \ \ \ \
| | * | | | | | enabling nested selectionValerio Virgillito2012-02-20
| | * | | | | | formatting and removing un-used code from the stageValerio Virgillito2012-02-20
| | * | | | | | cleanupValerio Virgillito2012-02-20
| | * | | | | | Removing the log of the url requestsValerio Virgillito2012-02-20
| | * | | | | | Removing the timeline selection code.Valerio Virgillito2012-02-20
| | * | | | | | Merge branch 'refs/heads/master' into nested-selectionValerio Virgillito2012-02-20
| | |\ \ \ \ \ \
| | * | | | | | | formatting cleanupValerio Virgillito2012-02-20
| | * | | | | | | cleanup of the breadcrumbValerio Virgillito2012-02-20
| * | | | | | | | fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
| * | | | | | | | Revert "check cloud availability before open file picker and new file dialogs"Ananya Sen2012-02-21