| Commit message (Expand) | Author | Age |
... | |
* | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 |
|\| | | |
|
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| | |\ \ |
|
| | * \ \ | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| | |\ \ \ |
|
| | | * \ \ | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-22 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | * | | | Fixing eyedropper tool to get color from image data. This required us to work... | Nivesh Rajbhandari | 2012-02-22 |
| | * | | | | Do not use color object for stage's border since we don't allow users to modi... | Nivesh Rajbhandari | 2012-02-22 |
| | * | | | | Color chips expect a color object, not a css value. | Nivesh Rajbhandari | 2012-02-22 |
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| | |\ \ \ \
| | | |/ / /
| | |/| / /
| | | |/ / |
|
| | * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-20 |
| | |\ \ \ |
|
| | * \ \ \ | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-14 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-14 |
| | |\ \ \ \ \ |
|
| | * | | | | | | Working around inconsistent color object when getting/setting WebGL values. | Nivesh Rajbhandari | 2012-02-13 |
| | * | | | | | | Updated ink bottle tool to use new setColor routine in the mediator and contr... | Nivesh Rajbhandari | 2012-02-13 |
| * | | | | | | | App mode checking fix | Jose Antonio Marquez | 2012-02-22 |
| * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-22 |
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| | * | | | | | | Fix for bug that keeps Ninja from launching over HTTP. We need to wrap any ex... | John Mayhew | 2012-02-22 |
| | | |_|_|_|/
| | |/| | | | |
|
| * | | | | | | Cleaning up and commenting CSS IO | Jose Antonio Marquez | 2012-02-22 |
* | | | | | | | switch html document - re-initialize draw-utils and snap-manager on opening a... | Ananya Sen | 2012-02-23 |
|/ / / / / / |
|
* | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-22 |
|\| | | | | |
|
| * | | | | | user document main reel listener moved to the html-document class. | Valerio Virgillito | 2012-02-21 |
| * | | | | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal i... | Valerio Virgillito | 2012-02-21 |
| |\ \ \ \ \ |
|
| | * | | | | | enabling nested selection | Valerio Virgillito | 2012-02-20 |
| | * | | | | | Removing the log of the url requests | Valerio Virgillito | 2012-02-20 |
| | | |_|_|/
| | |/| | | |
|
| * | | | | | fixing the dirty flag and removing sass changes | Valerio Virgillito | 2012-02-21 |
* | | | | | | 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 |
|/ / / / / |
|
* | | | | | Revert "check cloud availability before open file picker and new file dialogs" | Ananya Sen | 2012-02-21 |
* | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-20 |
|\ \ \ \ \ |
|
| * \ \ \ \ | Merge pull request #11 from ericguzman/StylesControllerUpdates | Jose Antonio Marquez Russo | 2012-02-20 |
| |\ \ \ \ \ |
|
| | * \ \ \ \ | Merge branch 'StylesControllerUpdates' of github.com:ericguzman/ninja-interna... | Eric Guzman | 2012-02-20 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Styles controller - Check for element's window object before querying for mat... | Eric Guzman | 2012-02-20 |
| | | |/ / / / |
|
| | * / / / / | Styles Controller -Fix invalid variable reference when looking for element's ... | Eric Guzman | 2012-02-20 |
| | |/ / / / |
|
| * | | | | | Clean up and repairing manifest | Jose Antonio Marquez | 2012-02-19 |
* | | | | | | check cloud availability before open file picker and new file dialogs | Ananya Sen | 2012-02-20 |
* | | | | | | - moved tools specific keyboard controls for desing view only | Ananya Sen | 2012-02-20 |
|/ / / / / |
|
* | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-18 |
|\| | | | |
|
| * | | | | Chrome Preview | Jose Antonio Marquez | 2012-02-17 |
* | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-17 |
|\| | | | |
|
| * | | | | Adding webRequest redirects for iFrame templates | Jose Antonio Marquez | 2012-02-17 |
| * | | | | Adding Chrome webRequest intercept | Jose Antonio Marquez | 2012-02-17 |
| * | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-16 |
| |\ \ \ \ |
|
| | * | | | | Adding a data-RDGE-id attribute to each canvas to save/load canvas data | Valerio Virgillito | 2012-02-16 |
| | * | | | | Squashed commit of the following: | Jose Antonio Marquez | 2012-02-16 |
| | * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-15 |
| | |\ \ \ \ |
|
| * | \ \ \ \ | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-15 |
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge branch 'live-preview-fix' of https://github.com/mencio/ninja-internal i... | Valerio Virgillito | 2012-02-14 |
| | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | | |
|
| | * | | | | | Merge branch 'components' of https://github.com/mencio/ninja-internal into in... | Valerio Virgillito | 2012-02-14 |
| | |\ \ \ \ \ |
|