| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 | ||
| | | * | 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 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | 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> | ||
| * | | | | | | | | | | Code reformatting | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | | | Merge pull request #192 from ananyasen/Codeview-improvements | Valerio Virgillito | 2012-05-03 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | submitting project : Code Editor Improvements [Phase 1] | ||
| | * | | | | | | | | | | using prototype in the serialization | Ananya Sen | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-03 |
| | |\| | | | | | | | | | |||
| | * | | | | | | | | | | use data-montage-id instead of id in template | Ananya Sen | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-02 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||
| | * | | | | | | | | | | removing format button for now until fully implemented | Ananya Sen | 2012-05-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | | disable format button for now | Ananya Sen | 2012-05-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-01 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||
| | * | | | | | | | | | | added copyrights | Ananya Sen | 2012-05-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | | set up different activeline colors for different themes | Ananya Sen | 2012-04-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | | added shortkeys for commenting and uncomment | Ananya Sen | 2012-04-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | | IKNINJA-1562 : override font-size for some themes to allow xooming | Ananya Sen | 2012-04-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | | IKNINJA-1537 - don't show code hinting for ctrl+S | Ananya Sen | 2012-04-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1568 - code hinting not supported for son files Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | | added key shortcuts' list dropdown in view option bar | Ananya Sen | 2012-04-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | | increasing z-indem of code hinting dropdown to appear above the disabled panels | Ananya Sen | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | | IKNINJA-1534: don't show code hinting automatically, when word removed via ↵ | Ananya Sen | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backspaces Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-26 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen < | ||