| Commit message (Expand) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | | | * | | | | | | | | | 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 pull request #18 from mencio/file-io | Jose Antonio Marquez Russo | 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 | |
| | | * | | | | | | | | | | | | | Adjusting fill and ink bottle cursors to match the tips of the icons. | Nivesh Rajbhandari | 2012-02-24 | |
| | * | | | | | | | | | | | | | | Timeline : Selection Fix | Jonathan Duran | 2012-02-27 | |
| * | | | | | | | | | | | | | | | Timeline: further work on clearTimeline method. | Jon Reid | 2012-02-27 | |
| |/ / / / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | | | Timeline: Order of tweens and corresponding layers taken care over | Jonathan Duran | 2012-02-25 | |
| * | | | | | | | | | | | | | | Timeline : Adding Tweens Properties | Jonathan Duran | 2012-02-25 | |
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into Timeline | Jonathan Duran | 2012-02-25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | Timeline: Add grids to property tracks. First take on clearTimeline method on... | Jon Reid | 2012-02-24 | |
| | * | | | | | | | | | | | | | | Timeline: Bug fixes: Delete corresponding track when a style is deleted from ... | Jon Reid | 2012-02-24 | |
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-24 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-24 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-24 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-23 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Timeline: Add hottext fields to layers and serialize them throughout. | Jon Reid | 2012-02-23 | |
| * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-02-25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | / / / / / | ||||