aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | | * | | | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵Nivesh Rajbhandari2012-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 propertiesValerio Virgillito2012-04-30
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | converting the layout folder to use data-montage-idValerio Virgillito2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | 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>
| * | | | | | | | 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
| | | | | | | | | | | | |
* | | | | | | | | | | | | 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>
* | | | | | | | | | | | Code reformattingValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | Merge pull request #192 from ananyasen/Codeview-improvementsValerio Virgillito2012-05-03
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | submitting project : Code Editor Improvements [Phase 1]
| * | | | | | | | | | | using prototype in the serializationAnanya Sen2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-03
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-02
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | removing format button for now until fully implementedAnanya Sen2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | | disable format button for nowAnanya Sen2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | |