aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | / / / / / / / / / / / / | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | reverting old pi dataValerio Virgillito2012-03-09
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge pull request #30 from ananyasen/FileIO-ananyaJose Antonio Marquez Russo2012-03-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | null the arrays on all documents closed, so that they get garbage collectedAnanya 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | removed unnecessary console logsAnanya Sen2012-03-06
| | * | | | | | | | | | | | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ...Ananya Sen2012-03-06
| | * | | | | | | | | | | | | | | | | updated file picker image iconsAnanya Sen2012-03-06
| | * | | | | | | | | | | | | | | | | - detect document style edit [with Eric's input for styles-controller.js]Ananya Sen2012-03-06
| | * | | | | | | | | | | | | | | | | IKNINJA-1256 fix - needed to convert String object to stringAnanya Sen2012-03-06
| | * | | | | | | | | | | | | | | | | IKNINJA-1238 fix and fixing other js errors on switching and closing documentsAnanya Sen2012-03-06
| | * | | | | | | | | | | | | | | | | fixed picker address dropdown to backtrace till the logical driveAnanya Sen2012-03-06
| | * | | | | | | | | | | | | | | | | IKNINJA-1207: added check for design view to fix js errorAnanya Sen2012-03-06
| * | | | | | | | | | | | | | | | | | Adding I/O functionality to RDGEJose Antonio Marquez2012-03-08
| * | | | | | | | | | | | | | | | | | Merge pull request #29 from ericmueller/integrationJose Antonio Marquez Russo2012-03-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | / / / / / / / / / / | | | |_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | removed an unused parameter to CanvasDataManagerhwc4872012-03-08
| | * | | | | | | | | | | | | | | | Commented out code for loading for runtimehwc4872012-03-08
| | * | | | | | | | | | | | | | | | Fix for runtime Radial blur materialhwc4872012-03-08
| | * | | | | | | | | | | | | | | | Fixed a few problems with Plasma material.hwc4872012-03-07
| | * | | | | | | | | | | | | | | | File IOhwc4872012-03-07
| | * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-03-06
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | IOhwc4872012-03-06
| | * | | | | | | | | | | | | | | | Updated buildShapeModel to set PI and selection values too and also avoid fil...Nivesh Rajbhandari2012-03-06
| | * | | | | | | | | | | | | | | | update the shapeModel after importhwc4872012-03-06
| | * | | | | | | | | | | | | | | | Authortime import of 2d & 3d canvaseshwc4872012-03-06
| | * | | | | | | | | | | | | | | | Merge branch 'TimelineUber' of github.com:imix23ways/ninja-internal into inte...hwc4872012-03-06
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | File IOhwc4872012-03-06
| | * | | | | | | | | | | | | | | | | Create element models based on nodeName.Nivesh Rajbhandari2012-03-06
| | * | | | | | | | | | | | | | | | | Corrections for canvas file IOhwc4872012-03-05
| | * | | | | | | | | | | | | | | | | WebGL & Canvas2D file IOhwc4872012-03-05
| | * | | | | | | | | | | | | | | | | Added more materials/canvas2D drawing to runtime.hwc4872012-03-05
| | * | | | | | | | | | | | | | | | | WebGL File IOhwc4872012-03-02
| | * | | | | | | | | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integrationhwc4872012-02-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | WebGL file I/Ohwc4872012-02-29
* | | | | | | | | | | | | | | | | | | | Merge dhg637 DisabledState into master.Valerio Virgillito2012-03-12
* | | | | | | | | | | | | | | | | | | | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumbArmen Kesablyan2012-03-12
| |_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | |