| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-08 | |
| | | |\ \ | ||||
| | | * | | | Adding SAVE for I/O | Jose Antonio Marquez | 2012-05-08 | |
| | | | | | | | | | | | | | | | | | | | | | Adding save functionality to new template. Need to implement user UI for prompts and also clean up... | |||
| | * | | | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-08 | |
| | |\ \ \ \ | | | |/ / | | |/| | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | |||
| | | * | | | Merge pull request #203 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-08 | |
| | | |\ \ \ | | | | | | | | | | | | | Get clicked element when body is scrolled. Also fixed zoom code's iframe reference. | |||
| | | | * | | | Get clicked element when body is scrolled. | Nivesh Rajbhandari | 2012-05-08 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-08 | |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||
| | * | | | | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-08 | |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | | | ||||
| | * | | | | | Merge pull request #202 from joseeight/Document | Valerio Virgillito | 2012-05-08 | |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | Chrome Preview | |||
| | | * | | | | Adding Chrome Preview | Jose Antonio Marquez | 2012-05-08 | |
| | | | | | | | ||||
| | * | | | | | Merge pull request #200 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-08 | |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | Scrolling support for stage. | |||
| | | * | | | | Stage should update scroll offsets when scrolled. Note that this is not ↵ | Nivesh Rajbhandari | 2012-05-08 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always correct because we don't get a scroll end event. Updating Pan Tool to update scroll bars. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-07 | |
| | | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | Merge pull request #199 from joseeight/Document | Valerio Virgillito | 2012-05-07 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Cleaning up webGL | |||
| | | * \ \ \ \ | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-07 | |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||
| | * | | | | | | Merge pull request #198 from joseeight/Document | Valerio Virgillito | 2012-05-07 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Cleaning up some CSS parsers. | |||
| | | | * | | | | | Moving webGL to own helper class | Jose Antonio Marquez | 2012-05-07 | |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | Cleaning up webGL for better working files. | |||
| | | * | | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-07 | |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||
| | | * | | | | | Extracting CSS methods to parsing class. | Jose Antonio Marquez | 2012-05-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to do the same with webGL. | |||
| | | | * | | | | Adding back currentView property in document-html so that menus work. | Nivesh Rajbhandari | 2012-05-07 | |
| | | |/ / / / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | Merge pull request #196 from joseeight/Document | Valerio Virgillito | 2012-05-07 | |
| | |\| | | | | | | | | | | | | | | | | Adding webGL for open file. | |||
| | | * | | | | Adding webGL support for opening files | Jose Antonio Marquez | 2012-05-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Added I/O for loading webGL on open file. I/O support for saving to come. | |||
| | | * | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-07 | |
| | | |\ \ \ \ | | |/ / / / | |/| | | | | ||||
| | * | | | | | Merge pull request #195 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-04 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fixes for 3d, selection, and keyboard shortcuts | |||
| | | * | | | | | Temporarily skipping activeDocument.currentView check so keyboard shortcuts ↵ | Nivesh Rajbhandari | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | | Fixing references to iframe's styles in new template. | Nivesh Rajbhandari | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | | Draw 3d grid by default since app model is not hooked up yet. | Nivesh Rajbhandari | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-04 | |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||
| | * | | | | | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-04 | |
| | |\ \ \ \ \ \ | ||||
| | | | * | | | | | Fixing body's default styles. | Nivesh Rajbhandari | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | * | | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-04 | |
| | | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-web/default_html.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | | Merge pull request #193 from joseeight/Document | Valerio Virgillito | 2012-05-03 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | New Document View | |||
| | | | | * | | | | | Removed special-casing for new template workflow. Instead, we will enforce ↵ | Nivesh Rajbhandari | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a width and height on the body in order to do 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | | * | | | | | Fixing selection and layout code to exclude SCRIPT and STYLE tags. | Nivesh Rajbhandari | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-04 | |
| | | | | | |\ \ \ \ | | | | | |/ / / / | | | | |/| | | | | ||||
| | | | | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-03 | |
| | | | |_|/| | | | | | |/| | | | | | | ||||
| | | * | | | | | | | Clean up, ready for alpha check-in | Jose Antonio Marquez | 2012-05-03 | |
| | | | | | | | | | | ||||
| | | * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-03 | |
| | | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||
| | | * | | | | | | | Full CSS support on open | Jose Antonio Marquez | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add full CSS for files on open (including loading cross-domain). This is only for files that are opened. | |||
| | | * | | | | | | | Reloading local stylesheets | Jose Antonio Marquez | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the reload method of local linked styles, still need to parse style contents for URLs and also add cross-domain stylesheet support. | |||
| | | * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-02 | |
| | | |\ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | Adding hack to allow for blank documents to open | Jose Antonio Marquez | 2012-05-02 | |
| | | | | | | | | | | | ||||
| | | * | | | | | | | | Switching DOM Mutation Events to HTML5 | Jose Antonio Marquez | 2012-05-02 | |
| | | | | | | | | | | | ||||
| | | * | | | | | | | | Partial URL parsing | Jose Antonio Marquez | 2012-05-02 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added temporary URL parsing to document assets. (head and body) | |||
| | | * | | | | | | | | Preliminary Open File (new template) | Jose Antonio Marquez | 2012-05-02 | |
| | | | | | | | | | | | | ||||