| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added basic open file functionality, does not parse document for URLs. | |||
| | | * | | | | | | | | More clean up, updating menu items | Jose Antonio Marquez | 2012-05-01 | |
| | | | | | | | | | | | ||||
| | | * | | | | | | | | Fixing bindings to new model | Jose Antonio Marquez | 2012-05-01 | |
| | | | | | | | | | | | ||||
| | | * | | | | | | | | Cleaning up template | Jose Antonio Marquez | 2012-05-01 | |
| | | | | | | | | | | | ||||
| | | * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-01 | |
| | | |\ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | Preliminary IO to new DOM view | Jose Antonio Marquez | 2012-05-01 | |
| | | | | | | | | | | | | ||||
| | | * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-01 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | Setting up new architecture for I/O | Jose Antonio Marquez | 2012-05-01 | |
| | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-27 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-26 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-26 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-24 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | Clean up | Jose Antonio Marquez | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | Merge pull request #239 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-05-16 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tool Options styling and Icon update | |||
| | | * | | | | | | | | | | | | | | | fixed bug with keyboard shortcut for fill/ink tool | John Mayhew | 2012-05-16 | |
| | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | -added new images for the text tool options | John Mayhew | 2012-05-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -simplified text options CSS -fixed styling to accommodate new images | |||
| | | * | | | | | | | | | | | | | | | updated object 3D options bar to use the new radio styles | John Mayhew | 2012-05-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||