aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* 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>
| * | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | added copyrightsAnanya Sen2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | set up different activeline colors for different themesAnanya Sen2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | added shortkeys for commenting and uncommentAnanya Sen2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | IKNINJA-1562 : override font-size for some themes to allow xoomingAnanya Sen2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | IKNINJA-1537 - don't show code hinting for ctrl+SAnanya Sen2012-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 barAnanya Sen2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | increasing z-indem of code hinting dropdown to appear above the disabled panelsAnanya Sen2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | IKNINJA-1534: don't show code hinting automatically, when word removed via ↵Ananya Sen2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backspaces Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |