Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | | * | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 | |
| | | | |\ \ \ \ | ||||
| | | | * | | | | | refresh draw-utils, snap-manager, view-utils for html document stitching | Ananya Sen | 2012-02-23 | |
| | | | * | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 | |
| | | | |\ \ \ \ \ | ||||
| | | | * | | | | | | switch html document - re-initialize draw-utils and snap-manager on opening a... | Ananya Sen | 2012-02-23 | |
| | | * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-24 | |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | | | ||||
| | | * | | | | | | | Added import/export of RDGE data | Jose Antonio Marquez | 2012-02-24 | |
| | | | |_|_|/ / / | | | |/| | | | | | ||||
| | | * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 | |
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | ||||
| | | * | | | | | | Merge pull request #17 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-02-23 | |
| | | |\ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int... | hwc487 | 2012-02-23 | |
| | | | |\ \ \ \ \ \ | ||||
| | | | * | | | | | | | GL save and reload. | hwc487 | 2012-02-22 | |
| | | | * | | | | | | | Runtime classes | hwc487 | 2012-02-22 | |
| | | | * | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integration | hwc487 | 2012-02-22 | |
| | | | |\ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int... | hwc487 | 2012-02-22 | |
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ | | | | | |/| | | | | | | ||||
| | | | * | | | | | | | | Added all materials back in | hwc487 | 2012-02-22 | |
| | | | * | | | | | | | | Adding all the shaders back in | hwc487 | 2012-02-22 | |
| | | | * | | | | | | | | Adding bug fixes. | hwc487 | 2012-02-22 | |
| | | | * | | | | | | | | Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into integr... | hwc487 | 2012-02-21 | |
| | | | |\ \ \ \ \ \ \ \ | ||||
| | | * | \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | | | ||||
| | | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | Fixing document mode check | Jose Antonio Marquez | 2012-02-23 | |
| | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | ||||
| | | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | Adding url clean up to HTML on save | Jose Antonio Marquez | 2012-02-23 | |
| | | * | | | | | | | | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into file-io | Valerio Virgillito | 2012-02-23 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | Temp fix for CSS url data | Jose Antonio Marquez | 2012-02-22 | |
| | | | * | | | | | | | | | | | App mode checking fix | Jose Antonio Marquez | 2012-02-22 | |
| | | | * | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-22 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | Cleaning up and commenting CSS IO | Jose Antonio Marquez | 2012-02-22 | |
| | | | * | | | | | | | | | | | | Logic to save <style> for a file | Jose Antonio Marquez | 2012-02-22 | |
| | | | * | | | | | | | | | | | | Merge pull request #16 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-22 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-22 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | * | | | | | | | | | | | | fix bug when closing the first document tab | Ananya Sen | 2012-02-21 | |
| | | | | * | | | | | | | | | | | | edit by Eric G.: catch the error instead of doing the null check for the stal... | Ananya Sen | 2012-02-21 | |
| | | | | * | | | | | | | | | | | | added null check for matchedRules in styles-controller.js, to fix js error on... | Ananya Sen | 2012-02-21 | |
| | | | | * | | | | | | | | | | | | - file picker - select file on double click | Ananya Sen | 2012-02-21 | |
| | | | * | | | | | | | | | | | | | Removed css not needed in Ninja Template | Jose Antonio Marquez | 2012-02-22 | |
| | | | * | | | | | | | | | | | | | Merge pull request #15 from mencio/file-io | Jose Antonio Marquez Russo | 2012-02-22 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | Improving temp CSS loading fix | Jose Antonio Marquez | 2012-02-22 | |
| | | | * | | | | | | | | | | | | | Merge pull request #14 from mencio/file-io | Jose Antonio Marquez Russo | 2012-02-21 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | | Temp CSS fix (for file open) | Jose Antonio Marquez | 2012-02-21 | |
| | | | | |_|_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | renaming makeElementModel2 to makeModelFromElement | Valerio Virgillito | 2012-02-23 | |
| | | * | | | | | | | | | | | | | | Enabling outline on open documents and parsing doom on open to create models. | Valerio Virgillito | 2012-02-23 | |
| | | * | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into file-io | Valerio Virgillito | 2012-02-22 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | / / / / / / / / / | | | | | |_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | moving the default folder location to the navigator to fix the ok button issue | Valerio Virgillito | 2012-02-22 | |
| | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | Adding some comments. | Valerio Virgillito | 2012-02-21 | |
| | | * | | | | | | | | | | | | Adding the default folder by default when opening a new file dialog. | Valerio Virgillito | 2012-02-21 | |
| | | * | | | | | | | | | | | | cleanup - using montage functions handlers and using the NJevent | Valerio Virgillito | 2012-02-21 | |
| | | * | | | | | | | | | | | | cleanup - Removing temporary div to render the popups | Valerio Virgillito | 2012-02-21 | |
| | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-24 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Moved all color updating routines to a single function. | Nivesh Rajbhandari | 2012-02-24 | |
| | * | | | | | | | | | | | | Distinguish between border top/right/bottom/left colors. Also, fall back to s... | Nivesh Rajbhandari | 2012-02-24 |