| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 |
| |\ | |||
| | * | Merge pull request #17 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-02-23 |
| | |\ | | | | | | | Integration | ||
| | | * | GL save and reload. | hwc487 | 2012-02-22 |
| | | | | |||
| * | | | refresh draw-utils, snap-manager, view-utils for html document stitching | Ananya Sen | 2012-02-23 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | 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 |
| | | | | | | | | | | | | | | | | | Added a temp fix to parse out the app url that is placed in the CSS styles. | ||
| | | * | | 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 |
| | | | | | | | | | | | | | | | | | Saving CSS in <style> tags, need to implement saving CSS to files. | ||
| | | * | | Removed css not needed in Ninja Template | Jose Antonio Marquez | 2012-02-22 |
| | | | | | |||
| | * | | | renaming makeElementModel2 to makeModelFromElement | Valerio Virgillito | 2012-02-23 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Enabling outline on open documents and parsing doom on open to create models. | Valerio Virgillito | 2012-02-23 |
| | | |/ | |/| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | switch html document - re-initialize draw-utils and snap-manager on opening ↵ | Ananya Sen | 2012-02-23 |
| | |/ |/| | | | | | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Improving temp CSS loading fix | Jose Antonio Marquez | 2012-02-22 |
| | | | | | | | | | Adding logic to parse the entire DOM and insert the style tag loading the link element content directly above. | ||
| * | | Temp CSS fix (for file open) | Jose Antonio Marquez | 2012-02-21 |
| |/ | | | | Implemented temporary work-around to the css-cross-origin issue on files loaded into Ninja. Fix is for open file, need to implement save functionality and integrate with CSS panel. | ||
| * | user document main reel listener moved to the html-document class. | Valerio Virgillito | 2012-02-21 |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | fixing the dirty flag and removing sass changes | Valerio Virgillito | 2012-02-21 |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Clean up and repairing manifest | Jose Antonio Marquez | 2012-02-19 |
| | | |||
| * | Chrome Preview | Jose Antonio Marquez | 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 |
| | | | | | Need to add logic to resolve file's actual URL dynamically. | ||
| * | Moving Ninja iFrame templates | Jose Antonio Marquez | 2012-02-16 |
| | | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-02-16 |
| | | |||
| * | Setting up webGL library copy on save | Jose Antonio Marquez | 2012-02-15 |
| | | |||
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-15 |
| | | | | | | Conflicts: js/document/html-document.js | ||
| * | Reverting text/html document classes and setting up MVC folder structure | Jose Antonio Marquez | 2012-02-14 |
| Setting up the folder structure for the proposed set up for documents in Ninja. Reverted to have a temp HTML/Text document class. Tweak some UI for file pickers. | |||