aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'FileIO-Build-Candidate' of https://github.com/joseeight/ninja-i...Valerio Virgillito2012-02-27
|\
| * Merge pull request #20 from joseeight/FileIOJose Antonio Marquez Russo2012-02-26
| |\
| | * Cleaning up formatting for webGL dataJose Antonio Marquez2012-02-26
| | * Fixed issue with losing track of Ninja template cssJose Antonio Marquez2012-02-26
| | * Cleaning up comments for external styles loadingJose Antonio Marquez2012-02-25
| | * Cleaning up ninja-data attributesJose Antonio Marquez2012-02-25
| | * Adding prettify code to I/OJose Antonio Marquez2012-02-24
| |/
| * Merge pull request #19 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-24
| |\
| | * - 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
| | |\
| | * | refresh draw-utils, snap-manager, view-utils for html document stitchingAnanya Sen2012-02-23
| | * | 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
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 09:53:10 +0000