| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Squashed commit FileIO-Build-Candidate into Master | Valerio Virgillito | 2012-03-06 |
| | | | | | | | Fixing issues with HTML and CSS URLs. Adjusted RegEx logic. Also code a mirror update and undo/redo changes were merged into this request. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Fixing WebGL not available bug | Jose Antonio Marquez | 2012-03-06 |
| | | |||
| * | Merge pull request #87 from joseeight/FileIO-Build-Candidate | Valerio Virgillito | 2012-02-29 |
| |\ | | | | | Fixes to preview caching issues | ||
| | * | Preview Fix | Jose Antonio Marquez | 2012-02-29 |
| | | | | | | | | | Adding save all logic before preview, temporary fix. | ||
| | * | Fix: Caching issue with chrome tab API | Jose Antonio Marquez | 2012-02-29 |
| | | | | | | | | | Using window.open to test movie. | ||
| * | | Merge pull request #81 from ananyasen/integration-candidate | Valerio Virgillito | 2012-02-28 |
| |\ \ | |/ |/| | persist selections while switching documents | ||
| | * | persist selections while switching documents | Ananya Sen | 2012-02-28 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | CSS attributes | Jose Antonio Marquez | 2012-02-28 |
| |/ | | | | Setting up logic to include attributes in <link> for the <style> duplicates and add attributes created in Ninja back to <link> tag on save. | ||
| * | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-27 |
| |\ | |||
| | * | Fixed issue with losing track of Ninja template css | Jose Antonio Marquez | 2012-02-26 |
| | | | | | | | | | Also cleaned up URL getter for app in cleaning string code. | ||
| | * | Cleaning up comments for external styles loading | Jose Antonio Marquez | 2012-02-25 |
| | | | |||
| | * | Cleaning up ninja-data attributes | Jose Antonio Marquez | 2012-02-25 |
| | | | | | | | | | Added logic to load cross-domain CSS from CDN, but need to explore how to load without impacting permissions. | ||
| | * | Merge pull request #19 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-24 |
| | |\ | | | | | | | FileIO branch pull request | ||
| | * | | Added import/export of RDGE data | Jose Antonio Marquez | 2012-02-24 |
| | | | | | | | | | | | | | This is only the IO aspect, the data getter seems broken for 2D canvas and does not allow for save, and nothing works for setting the data on load. However, the IO aspect of saving and opening the data are not incorporated. | ||
| * | | | - save show3DGrid flag per document while switching documents | Ananya Sen | 2012-02-27 |
| | |/ |/| | | | | | | | | | - fix zoom tool keyboard control to listen to Z when ctrl and shift keys are not pressed with it Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | 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. | |||