[Pkg-javascript-commits] [node-jade] 03/14: Merge tag 'upstream/1.7.0'

[Leo Iannacone]

This is an automated email from the git hooks/post-receive script.

l3on-guest pushed a commit to branch master
in repository node-jade.

commit 28c8e4ab915e68b90cf57c7669562ee0cbf4d523
Merge: ea002e7 99760c9
Author: Leo Iannacone <l3on at ubuntu.com>
Date:   Fri Oct 10 16:58:47 2014 +0200

    Merge tag 'upstream/1.7.0'
    
    Upstream version 1.7.0
    
    # gpg: Signature made ven 10 ott 2014 16:58:44 CEST using RSA key ID D282FC25
    # gpg: Good signature from "Leo Iannacone <l3on at ubuntu.com>"
    # gpg:                 aka "Leo Iannacone <leo.iannacone at gmail.com>"
    # gpg:                 aka "Leo Iannacone <l3on at ubuntu-it.org>"
    # gpg:                 aka "Leonardo Iannacone <leonardo.iannacone at studio.unibo.it>"
    # gpg:                 aka "Leo Iannacone <info at leoiannacone.com>"
    # gpg:                 aka "Leonardo Iannacone <liannacone at arces.unibo.it>"

 .gitignore                                     |   12 -
 History.md                                     |   19 +
 bin/jade.js                                    |    5 +
 component.json                                 |    4 +-
 docs/versions.json                             |    4 +-
 docs/views/api.jade                            |    3 +
 docs/views/command-line.jade                   |    1 +
 docs/views/reference.jade                      |    1 +
 docs/views/reference/attributes.jade           |   80 +-
 docs/views/reference/code.jade                 |   44 +-
 docs/views/reference/comments.jade             |    2 +-
 docs/views/reference/doctype.jade              |   41 +-
 docs/views/reference/extends.jade              |    2 +-
 docs/views/reference/inheritance.jade          |  104 +++
 docs/views/reference/iteration.jade            |   20 +-
 docs/views/reference/mixins.jade               |   48 +-
 docs/views/reference/tags.jade                 |   16 +
 jade-language.md                               | 1023 ------------------------
 jade.md                                        |  510 ------------
 lib/compiler.js                                |   33 +-
 lib/filters-client.js                          |    3 +-
 lib/filters.js                                 |    5 +-
 lib/jade.js                                    |   17 +-
 lib/lexer.js                                   |   14 +-
 lib/parser.js                                  |    1 +
 lib/self-closing.js                            |   22 -
 lib/utils.js                                   |    6 +
 package.json                                   |   11 +-
 test/cases/auxiliary/mixin-at-end-of-file.jade |    3 +
 test/cases/mixin-at-end-of-file.html           |    3 +
 test/cases/mixin-at-end-of-file.jade           |    4 +
 test/cases/mixin.attrs.html                    |    3 +-
 test/cases/mixin.attrs.jade                    |    5 +
 test/cases/mixins.html                         |   10 +
 test/cases/mixins.jade                         |    2 +
 test/cases/mixins.rest-args.html               |    6 +
 test/cases/mixins.rest-args.jade               |    6 +
 test/error.reporting.js                        |    8 +
 test/fixtures/issue-1593/include-layout.jade   |    2 +
 test/fixtures/issue-1593/include.jade          |    4 +
 test/fixtures/issue-1593/index.jade            |    7 +
 test/fixtures/issue-1593/layout.jade           |    3 +
 test/jade.test.js                              |    8 +
 43 files changed, 507 insertions(+), 1618 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-jade.git