aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Expand)AuthorAge
...
| | * | | 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | 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
* | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-12
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Temp Gradient FixJose Antonio Marquez2012-03-09
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ...Ananya Sen2012-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
| | |_|/ | |/| |
* | | | CSS Panel - Updating components, created toolbar components, and small change...Eric Guzman2012-03-02
* | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-02-29
|\| | |
| * | | 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
| | |\
| | * | 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
| | |\ \ \
| | * | | | App mode checking fixJose Antonio Marquez2012-02-22
| | * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-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
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | fix bug when closing the first document tabAnanya Sen2012-02-21
| * | | | | edit by Eric G.: catch the error instead of doing the null check for the stal...Ananya Sen2012-02-21
| * | | | | added null check for matchedRules in styles-controller.js, to fix js error on...Ananya Sen2012-02-21