| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | | | | Removing more id and changing the appropriate CSS for them | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 | |
| | | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | ||||
| | | * | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 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> Conflicts: js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| | | * | | | | | | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-id | Valerio Virgillito | 2012-05-03 | |
| | | |\ \ \ \ \ \ | ||||
| | | | * | | | | | | Changing ID to Montage-ID for Color Panel | Jose Antonio Marquez | 2012-05-03 | |
| | | | | | | | | | | ||||
| | | | * | | | | | | Changing ID to Montage-ID for Color Components | Jose Antonio Marquez | 2012-05-03 | |
| | | | | |_|_|/ / | | | |/| | | | | ||||
| | | * | | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 | |
| | | |\| | | | | | ||||
| | | * | | | | | | Merge pull request #183 from mqg734/data-id | Valerio Virgillito | 2012-04-30 | |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Updating id to data-montage-id. | |||
| | | | * | | | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵ | Nivesh Rajbhandari | 2012-04-30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | | | | fixing the menu and tool properties | Valerio Virgillito | 2012-04-30 | |
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | | converting the layout folder to use data-montage-id | Valerio Virgillito | 2012-04-30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | | | 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> | |||
| | * | | | | | | | 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 t | |||