| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Integration | Jose Antonio Marquez | 2012-03-09 |
| |\ | |||
| | * | reverting old pi data | Valerio Virgillito | 2012-03-09 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Integration | Jose Antonio Marquez | 2012-03-09 |
| |\| | |||
| | * | Temp Gradient Fix | Jose Antonio Marquez | 2012-03-09 |
| | | | | | | | | | Temporary fix for getting gradient mode. | ||
| | * | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-03-09 |
| | |\ | |||
| | * \ | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-02-29 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | ||
| | * \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-28 |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-23 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-22 |
| | |\ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-21 |
| | |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-17 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-17 |
| | |\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-16 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-15 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | Bug Fixes | Jose Antonio Marquez | 2012-02-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144 | ||
| | * | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-08 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-08 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js | ||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-02 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js | ||
| * | | | | | | | | | | | | | | | | Fixing Issues for Windows Lib | Jose Antonio Marquez | 2012-03-09 |
| | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | Merge pull request #33 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-09 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integration | ||
| | * | | | | | | | | | | | | | | | | remap hard coded strings in rdge internal code. | hwc487 | 2012-03-09 |
| | | | | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal ↵ | hwc487 | 2012-03-09 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into integration Conflicts: js/document/html-document.js | ||
| | * | | | | | | | | | | | | | | | | | further removal of authortime asset path replacement. | hwc487 | 2012-03-09 |
| | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | Removing duplicate file | Jose Antonio Marquez | 2012-03-09 |
| | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | Clean up | Jose Antonio Marquez | 2012-03-09 |
| | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | Merge pull request #32 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-09 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added asset folder replacement to runtime load. | ||
| | * | | | | | | | | | | | | | | | | Removed asset path replacement at authortime. | hwc487 | 2012-03-09 |
| | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | Adding missing file for webGL, still need a fix for runtime | Jose Antonio Marquez | 2012-03-09 |
| |/ / / / / / / / / / / / / / / / | |||
| * | | | | | | | | | | | | | | | | Adding webGL I/O runtime functionality | Jose Antonio Marquez | 2012-03-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a problem that needs to be resolved in the CanvasRuntime. | ||
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/integration' into FileIO-Integration | Jose Antonio Marquez | 2012-03-09 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js | ||
| | * | | | | | | | | | | | | | | | | Canvas IO | hwc487 | 2012-03-08 |
| | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/draw-utils.js | ||
| | * | | | | | | | | | | | | | | | | Merge pull request #102 from dhg637/Panels | Valerio Virgillito | 2012-03-08 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Some Calculation issues and bugs & appended disabled state when no documents exist | ||
| | | * | | | | | | | | | | | | | | | | Disabled state for panels | Armen Kesablyan | 2012-03-07 |
| | | | | | | | | | | |||