aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-09
|\
| * Temp Gradient FixJose Antonio Marquez2012-03-09
* | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-09
|\|
| * IKNINJA-1270: fixed browser crashing when you close a document while playing ...Ananya Sen2012-03-08
* | gradient support for canvas-2d shapes.Nivesh Rajbhandari2012-03-07
* | Gradient support for canvas-2d rectangle.Nivesh Rajbhandari2012-03-07
* | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-07
|\|
| * Squashed commit FileIO-Build-Candidate into MasterValerio Virgillito2012-03-06
* | preliminary support for setting gradients on webgl shapes.Nivesh Rajbhandari2012-03-07
|/
* Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
* stage and elements fixesValerio Virgillito2012-03-01
* Merge pull request #88 from mqg734/ToolFixesValerio Virgillito2012-02-29
|\
| * Fix for performance issue when moving shapes. We don't need to call render e...Nivesh Rajbhandari2012-02-29
* | Squashed commit of the following:Jonathan Duran2012-02-29
* | fix for creatingNewFile flagJonathan Duran2012-02-29
|/
* Merge branch 'local-storage-version' of https://github.com/mencio/ninja-inter...Valerio Virgillito2012-02-27
|\
| * clearing the old local setting and using the new version/prefix local settings.Valerio Virgillito2012-02-24
| * Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-23
| |\
| | * Fixing app mode check.Valerio Virgillito2012-02-23
| * | local storage integration and versioningValerio Virgillito2012-02-22
* | | - added closeDocument event for timelineAnanya Sen2012-02-24
* | | - added flag for timeline to identify new file flowAnanya Sen2012-02-24
* | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
|\ \ \
| * | | Fixing document mode checkJose Antonio Marquez2012-02-23
* | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
|\| | |
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| | |\ \
| | * \ \ Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh 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
| | * | | | Do not use color object for stage's border since we don't allow users to modi...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
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | * | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| | |\ \ \ \ \
| | * | | | | | Working around inconsistent color object when getting/setting WebGL values.Nivesh Rajbhandari2012-02-13
| | * | | | | | Updated ink bottle tool to use new setColor routine in the mediator and contr...Nivesh Rajbhandari2012-02-13
| * | | | | | | App mode checking fixJose Antonio Marquez2012-02-22
| * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-22
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Fix for bug that keeps Ninja from launching over HTTP. We need to wrap any ex...John Mayhew2012-02-22
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Cleaning up and commenting CSS IOJose Antonio Marquez2012-02-22
* | | | | | | switch html document - re-initialize draw-utils and snap-manager on opening a...Ananya Sen2012-02-23
|/ / / / / /
* | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-22
|\| | | | |
| * | | | | 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
| | * | | | | Removing the log of the url requestsValerio Virgillito2012-02-20
| | | |_|_|/ | | |/| | |
| * | | | | fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
* | | | | | fix bug when closing the first document tabAnanya Sen2012-02-21