aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-07
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #198 from joseeight/DocumentValerio Virgillito2012-05-07
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Cleaning up some CSS parsers.
| | | * | | | | Moving webGL to own helper classJose Antonio Marquez2012-05-07
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Cleaning up webGL for better working files.
| | * | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-07
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Extracting CSS methods to parsing class.Jose Antonio Marquez2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to do the same with webGL.
| | | * | | | Adding back currentView property in document-html so that menus work.Nivesh Rajbhandari2012-05-07
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Merge pull request #196 from joseeight/DocumentValerio Virgillito2012-05-07
| |\| | | | | | | | | | | | | | | | Adding webGL for open file.
| | * | | | Adding webGL support for opening filesJose Antonio Marquez2012-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 DocumentJose Antonio Marquez2012-05-07
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #195 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-04
| |\ \ \ \ \ | | | | | | | | | | | | | | Fixes for 3d, selection, and keyboard shortcuts
| | * | | | | Temporarily skipping activeDocument.currentView check so keyboard shortcuts ↵Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Fixing references to iframe's styles in new template.Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Draw 3d grid by default since app model is not hooked up yet.Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-04
| |\ \ \ \ \ \
| | | * | | | | Fixing body's default styles.Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-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/DocumentValerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | New Document View
| | | | * | | | | Removed special-casing for new template workflow. Instead, we will enforce ↵Nivesh Rajbhandari2012-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 Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-04
| | | | | |\ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | | * | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-03
| | | |_|/| | | | | | |/| | | | | |
| | * | | | | | | Clean up, ready for alpha check-inJose Antonio Marquez2012-05-03
| | | | | | | | |
| | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-03
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Full CSS support on openJose Antonio Marquez2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add full CSS for files on open (including loading cross-domain). This is only for files that are opened.
| | * | | | | | | Reloading local stylesheetsJose Antonio Marquez2012-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 DocumentJose Antonio Marquez2012-05-02
| | |\ \ \ \ \ \ \
| | * | | | | | | | Adding hack to allow for blank documents to openJose Antonio Marquez2012-05-02
| | | | | | | | | |
| | * | | | | | | | Switching DOM Mutation Events to HTML5Jose Antonio Marquez2012-05-02
| | | | | | | | | |
| | * | | | | | | | Partial URL parsingJose Antonio Marquez2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added temporary URL parsing to document assets. (head and body)
| | * | | | | | | | Preliminary Open File (new template)Jose Antonio Marquez2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added basic open file functionality, does not parse document for URLs.
| | * | | | | | | | More clean up, updating menu itemsJose Antonio Marquez2012-05-01
| | | | | | | | | |
| | * | | | | | | | Fixing bindings to new modelJose Antonio Marquez2012-05-01
| | | | | | | | | |
| | * | | | | | | | Cleaning up templateJose Antonio Marquez2012-05-01
| | | | | | | | | |
| | * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-01
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Preliminary IO to new DOM viewJose Antonio Marquez2012-05-01
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-01
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Setting up new architecture for I/OJose Antonio Marquez2012-05-01
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-27
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-26
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-26
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Clean upJose Antonio Marquez2012-04-19
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_