You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by ed...@apache.org on 2015/11/16 05:31:42 UTC
[1/5] incubator-freemarker-docgen git commit: fixing eslint rule
Repository: incubator-freemarker-docgen
Updated Branches:
refs/heads/master 464c0006f -> 82c4a3e31
fixing eslint rule
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/770d4ece
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/770d4ece
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/770d4ece
Branch: refs/heads/master
Commit: 770d4ece343b01c86270f3ace2a1b488c3df2af2
Parents: ee975b6
Author: rather <ra...@gmail.com>
Authored: Sun Oct 11 16:06:12 2015 -0700
Committer: rather <ra...@gmail.com>
Committed: Sun Nov 15 20:30:07 2015 -0800
----------------------------------------------------------------------
.eslintrc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/770d4ece/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index ad3b111..0c99890 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -6,11 +6,11 @@ globals:
toc: true
breadcrumb: true
-
+
rules:
indent: [2, 2]
quotes: [2, "single"]
- no-spaced-func: [2, "never"]
+ no-spaced-func: [2]
space-before-function-paren: [2, "never"]
valid-jsdoc: [2, { prefer: { "return": "returns"}}]
space-after-keywords: [2, "always"]
[5/5] incubator-freemarker-docgen git commit: Merge branch 'master'
of https://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen
Posted by ed...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/82c4a3e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/82c4a3e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/82c4a3e3
Branch: refs/heads/master
Commit: 82c4a3e31c6ee3b8c69788a34306051834d78282
Parents: 5e22cdd 464c000
Author: rather <ra...@gmail.com>
Authored: Sun Nov 15 20:31:30 2015 -0800
Committer: rather <ra...@gmail.com>
Committed: Sun Nov 15 20:31:30 2015 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/5] incubator-freemarker-docgen git commit: fixing canonical
misspelling for FREEMARKER-11
Posted by ed...@apache.org.
fixing canonical misspelling for FREEMARKER-11
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/5e22cdde
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/5e22cdde
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/5e22cdde
Branch: refs/heads/master
Commit: 5e22cddebf7a764232d5ab47027766c886b7c8bf
Parents: 6fe1c36
Author: rather <ra...@gmail.com>
Authored: Sun Nov 15 20:27:14 2015 -0800
Committer: rather <ra...@gmail.com>
Committed: Sun Nov 15 20:30:51 2015 -0800
----------------------------------------------------------------------
src/main/org/freemarker/docgen/templates/page.ftlh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/5e22cdde/src/main/org/freemarker/docgen/templates/page.ftlh
----------------------------------------------------------------------
diff --git a/src/main/org/freemarker/docgen/templates/page.ftlh b/src/main/org/freemarker/docgen/templates/page.ftlh
index 9c548a9..fc70ec8 100644
--- a/src/main/org/freemarker/docgen/templates/page.ftlh
+++ b/src/main/org/freemarker/docgen/templates/page.ftlh
@@ -69,7 +69,7 @@
<#local urlPath = CreateLinkFromID(.node.@id)>
<#local canonicalUrl = deployUrl?ensureEndsWith("/") + urlPath?removeBeginning("/")>
<meta property="og:url" content="${canonicalUrl}">
- <link rel="canoical" href="${canonicalUrl}">
+ <link rel="canonical" href="${canonicalUrl}">
</#if>
</#macro>
[3/5] incubator-freemarker-docgen git commit: reset word-break for
links in tables. this fixes FREEMARKER-4
Posted by ed...@apache.org.
reset word-break for links in tables. this fixes FREEMARKER-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/6fe1c363
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/6fe1c363
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/6fe1c363
Branch: refs/heads/master
Commit: 6fe1c363785cb441bdebefc421a20e8a5d4a8f3c
Parents: 15129f5
Author: rather <ra...@gmail.com>
Authored: Sun Oct 11 16:30:15 2015 -0700
Committer: rather <ra...@gmail.com>
Committed: Sun Nov 15 20:30:46 2015 -0800
----------------------------------------------------------------------
src/main/org/freemarker/docgen/less/lib/components/table.less | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/6fe1c363/src/main/org/freemarker/docgen/less/lib/components/table.less
----------------------------------------------------------------------
diff --git a/src/main/org/freemarker/docgen/less/lib/components/table.less b/src/main/org/freemarker/docgen/less/lib/components/table.less
index 34e92ba..9aea5a9 100644
--- a/src/main/org/freemarker/docgen/less/lib/components/table.less
+++ b/src/main/org/freemarker/docgen/less/lib/components/table.less
@@ -44,4 +44,8 @@
white-space: normal;
}
}
+
+ a {
+ word-break: normal;
+ }
}
[2/5] incubator-freemarker-docgen git commit: changing eslint
configuration to json
Posted by ed...@apache.org.
changing eslint configuration to json
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/commit/15129f5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/15129f5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/15129f5d
Branch: refs/heads/master
Commit: 15129f5d18d1f6061bca261880d95fb01994193b
Parents: 770d4ec
Author: rather <ra...@gmail.com>
Authored: Sun Oct 11 16:14:53 2015 -0700
Committer: rather <ra...@gmail.com>
Committed: Sun Nov 15 20:30:29 2015 -0800
----------------------------------------------------------------------
.eslintrc | 43 ++++++++++++++++++++++++-------------------
1 file changed, 24 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/15129f5d/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index 0c99890..9735638 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,19 +1,24 @@
-env:
- node: true
- browser: true
-
-globals:
- toc: true
- breadcrumb: true
-
-
-rules:
- indent: [2, 2]
- quotes: [2, "single"]
- no-spaced-func: [2]
- space-before-function-paren: [2, "never"]
- valid-jsdoc: [2, { prefer: { "return": "returns"}}]
- space-after-keywords: [2, "always"]
- space-before-blocks: [2, "always"]
- space-in-parens: [2, "never"]
- strict: [2, "never"]
+{
+ "rules": {
+ "indent": [2, 2],
+ "quotes": [2, "single"],
+ "linebreak-style": [2, "unix"],
+ "semi": [2, "always"],
+ "space-in-parens": [2, "never"],
+ "strict": [2, "never"],
+ "no-spaced-func": [2],
+ "space-before-function-paren": [2, "never"],
+ "valid-jsdoc": [2, { "prefer": { "return": "returns" } }],
+ "space-after-keywords": [2, "always"],
+ "space-before-blocks": [2, "always"],
+ "space-in-parens": [2, "never"]
+ },
+ "env": {
+ "browser": true
+ },
+ "globals": {
+ "toc": true,
+ "breadcrumb": true
+ },
+ "extends": "eslint:recommended"
+}