aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
* revert spaceJonathan Duran2012-03-15
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-15
|\
| * Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| * Merge pull request #110 from mqg734/WebGLFixesValerio Virgillito2012-03-13
| |\
| | * Fixed element mediator, PI, and eye-dropper to handle different borders sides...Nivesh Rajbhandari2012-03-12
| | * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-09
| | |\
| | * \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-09
| | |\ \
| | * | | 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
| | |\ \ \
| | * | | | preliminary support for setting gradients on webgl shapes.Nivesh Rajbhandari2012-03-07
| * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Temp Gradient FixJose Antonio Marquez2012-03-09
| | | |_|/ | | |/| |
| | * | | IKNINJA-1270: fixed browser crashing when you close a document while playing ...Ananya Sen2012-03-08
| | | |/ | | |/|
| * | | minor fixesAnanya Sen2012-03-07
| * | | added close file menu itemAnanya Sen2012-03-06
| * | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-06
| |\| |
| * | | IKNINJA-1270: fixed browser crashing when you close a document while playing ...Ananya Sen2012-03-06
| * | | - detect document style edit [with Eric's input for styles-controller.js]Ananya Sen2012-03-06
| * | | IKNINJA-1238 fix and fixing other js errors on switching and closing documentsAnanya Sen2012-03-06
| * | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-01
| |\ \ \
| * | | | Optimizing URL intercepting detectionJose Antonio Marquez2012-03-01
| * | | | Merge branch 'refs/heads/ninja-internal-master' into FileIOAnanya Sen2012-02-29
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/ninja-internal-master' into FileIOAnanya Sen2012-02-29
| |\ \ \ \ \
| * | | | | | fixed selection which click after switching to a documentAnanya Sen2012-02-29
| * | | | | | handle selections for switching documentsAnanya Sen2012-02-29
| * | | | | | fix for creatingNewFile flagAnanya Sen2012-02-28
| * | | | | | minor fixes in saving undo/redo stacks per documentAnanya Sen2012-02-28
| * | | | | | persist selections while switching documentsAnanya Sen2012-02-28
| * | | | | | persist undo/redo stack per html documentAnanya Sen2012-02-27
* | | | | | | Squashed commit of the following:Jonathan Duran2012-03-14
* | | | | | | Squashed commit of the following:Jonathan Duran2012-03-09
* | | | | | | Squashed commit of the following:Jonathan Duran2012-03-08
| |_|_|_|_|/ |/| | | | |
* | | | | | Squashed commit FileIO-Build-Candidate into MasterValerio Virgillito2012-03-06
| |_|_|_|/ |/| | | |
* | | | | 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