aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | | | * | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | switch html document - re-initialize draw-utils and snap-manager on opening a...Ananya Sen2012-02-23
| | | * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | * | | | | | | | | Added import/export of RDGE dataJose Antonio Marquez2012-02-24
| | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | | * | | | | | | | Merge pull request #17 from ericmueller/integrationJose Antonio Marquez Russo2012-02-23
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-02-23
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | GL save and reload.hwc4872012-02-22
| | | | * | | | | | | | Runtime classeshwc4872012-02-22
| | | | * | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integrationhwc4872012-02-22
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-02-22
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / | | | | | |/| | | | | | |
| | | | * | | | | | | | | Added all materials back inhwc4872012-02-22
| | | | * | | | | | | | | Adding all the shaders back inhwc4872012-02-22
| | | | * | | | | | | | | Adding bug fixes.hwc4872012-02-22
| | | | * | | | | | | | | Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into integr...hwc4872012-02-21
| | | | |\ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Fixing document mode checkJose Antonio Marquez2012-02-23
| | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Adding url clean up to HTML on saveJose Antonio Marquez2012-02-23
| | | * | | | | | | | | | | | Merge pull request #18 from mencio/file-ioJose Antonio Marquez Russo2012-02-23
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'FileIO' of github.com:joseeight/ninja-internal into file-ioValerio Virgillito2012-02-23
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Temp fix for CSS url dataJose Antonio Marquez2012-02-22
| | | * | | | | | | | | | | | | 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
| | | * | | | | | | | | | | | | | Logic to save <style> for a fileJose Antonio Marquez2012-02-22
| | | * | | | | | | | | | | | | | Merge pull request #16 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | 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
| | | | * | | | | | | | | | | | | | - file picker - select file on double clickAnanya Sen2012-02-21
| | | * | | | | | | | | | | | | | | Removed css not needed in Ninja TemplateJose Antonio Marquez2012-02-22
| | | * | | | | | | | | | | | | | | Merge pull request #15 from mencio/file-ioJose Antonio Marquez Russo2012-02-22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Improving temp CSS loading fixJose Antonio Marquez2012-02-22
| | | * | | | | | | | | | | | | | | Merge pull request #14 from mencio/file-ioJose Antonio Marquez Russo2012-02-21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Temp CSS fix (for file open)Jose Antonio Marquez2012-02-21
| | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | renaming makeElementModel2 to makeModelFromElementValerio Virgillito2012-02-23
| | | | | | | | * | | | | | | | | | Enabling outline on open documents and parsing doom on open to create models.Valerio Virgillito2012-02-23
| | | | | | | | * | | | | | | | | | Merge branch 'refs/heads/master' into file-ioValerio Virgillito2012-02-22
| | | | | | |_|/| | | | | | | | | | | | | | | |/| |/ / / / / / / / / /
| | | | | * | / / / / / / / / / / moving the default folder location to the navigator to fix the ok button issueValerio Virgillito2012-02-22
| | | | |/ / / / / / / / / / / /
| | | | * | | | | | | | | | | | Adding some comments.Valerio Virgillito2012-02-21
| | | | * | | | | | | | | | | | Adding the default folder by default when opening a new file dialog.Valerio Virgillito2012-02-21
| | | | * | | | | | | | | | | | cleanup - using montage functions handlers and using the NJeventValerio Virgillito2012-02-21
| | | | * | | | | | | | | | | | cleanup - Removing temporary div to render the popupsValerio Virgillito2012-02-21
| | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Moved all color updating routines to a single function.Nivesh Rajbhandari2012-02-24
| | * | | | | | | | | | | | | Distinguish between border top/right/bottom/left colors. Also, fall back to s...Nivesh Rajbhandari2012-02-24
| | * | | | | | | | | | | | | Adjusting fill and ink bottle cursors to match the tips of the icons.Nivesh Rajbhandari2012-02-24