You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2015/11/23 20:44:58 UTC
[1/5] allura git commit: [#8027] sort rat-excludes.txt
Repository: allura
Updated Branches:
refs/heads/db/8027 [created] 179bf1e38
[#8027] sort rat-excludes.txt
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/95a369ad
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/95a369ad
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/95a369ad
Branch: refs/heads/db/8027
Commit: 95a369adfefa55c177b61aea36a1ca70503684ac
Parents: 0e6cbbe
Author: Dave Brondsema <da...@brondsema.net>
Authored: Mon Nov 23 13:55:59 2015 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Nov 23 13:56:07 2015 -0500
----------------------------------------------------------------------
rat-excludes.txt | 48 ++++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/95a369ad/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index 8611fa0..6fbe5bb 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -1,53 +1,53 @@
-rat-excludes.txt
-**/setup.cfg
-**/*.json
-**/*.git/
**/*.egg-info/
-requirements*
-**/MANIFEST.in
+**/*.git/
+**/*.json
**/*.log
**/.coverage
+**/MANIFEST.in
**/nosetests.xml
-Allura/docs/_build/
+**/setup.cfg
Allura/allura/etc/mime.types
Allura/allura/lib/AsciiDammit.py
-Allura/allura/public/nf/js/jquery-base.js
-Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
-Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
-Allura/allura/public/nf/js/jquery.daterangepicker.js
-Allura/allura/public/nf/css/forge/ui.daterangepicker.css
Allura/allura/lib/widgets/resources/css/autocomplete.css
-Allura/allura/public/nf/css/forge/accordion.css
+Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
+Allura/allura/lib/widgets/resources/css/simplemde.min.css
Allura/allura/lib/widgets/resources/js/jqfontselector.js
Allura/allura/lib/widgets/resources/js/jquery.autosize-min.js
Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js
Allura/allura/lib/widgets/resources/js/jquery.tagsinput.js
+Allura/allura/lib/widgets/resources/js/simplemde.min.js
+Allura/allura/public/nf/css/blueprint/
+Allura/allura/public/nf/css/font-awesome.min.css
+Allura/allura/public/nf/css/forge/accordion.css
+Allura/allura/public/nf/css/forge/tooltipster.css
+Allura/allura/public/nf/css/forge/ui.daterangepicker.css
+Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
+Allura/allura/public/nf/fonts/
+Allura/allura/public/nf/js/jquery-base.js
+Allura/allura/public/nf/js/jquery.daterangepicker.js
Allura/allura/public/nf/js/jquery.flot.js
Allura/allura/public/nf/js/jquery.maxlength.min.js
Allura/allura/public/nf/js/jquery.tablesorter.js
-Allura/allura/public/nf/css/forge/tooltipster.css
Allura/allura/public/nf/js/jquery.tooltipster.js
Allura/allura/public/nf/js/jquery.viewport.js
-Allura/allura/public/nf/css/blueprint/
-Allura/allura/public/nf/js/sylvester.js
Allura/allura/public/nf/js/modernizr.js
Allura/allura/public/nf/js/react.min.js
-Allura/allura/public/nf/css/font-awesome.min.css
-Allura/allura/public/nf/fonts/
-Allura/allura/lib/widgets/resources/js/simplemde.min.js
-Allura/allura/lib/widgets/resources/css/simplemde.min.css
+Allura/allura/public/nf/js/sylvester.js
Allura/allura/tests/data/genshi_hello_tmpl
Allura/allura/tests/data/test_mime/text_file.txt
+Allura/docs/_build/
+Allura/run/dummy.txt
AlluraTest/jslint/
CHANGES
-Allura/run/dummy.txt
ForgeGit/forgegit/data/post-receive_tmpl
-ForgeSVN/forgesvn/tests/data/
ForgeImporters/forgeimporters/tests/data/google/empty-issue.html
-ForgeImporters/forgeimporters/tests/data/google/test-issue.html
ForgeImporters/forgeimporters/tests/data/google/test-issue-first-page.html
ForgeImporters/forgeimporters/tests/data/google/test-issue-prev-page.html
+ForgeImporters/forgeimporters/tests/data/google/test-issue.html
ForgeImporters/forgeimporters/trac/tests/data/test-list.csv
ForgeImporters/forgeimporters/trac/tests/data/test-list.html
-ForgeTracker/forgetracker/widgets/resources/js/jquery.multiselect.min.js
+ForgeSVN/forgesvn/tests/data/
ForgeTracker/forgetracker/widgets/resources/css/jquery.multiselect.css
+ForgeTracker/forgetracker/widgets/resources/js/jquery.multiselect.min.js
+rat-excludes.txt
+requirements*
\ No newline at end of file
[4/5] allura git commit: [#8027] ignore empty es6 file
Posted by br...@apache.org.
[#8027] ignore empty es6 file
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/39e111c0
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/39e111c0
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/39e111c0
Branch: refs/heads/db/8027
Commit: 39e111c0bd652f180dc1f45d226ef6c004874120
Parents: 89ff9f3
Author: Dave Brondsema <da...@brondsema.net>
Authored: Mon Nov 23 14:42:20 2015 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Nov 23 14:42:20 2015 -0500
----------------------------------------------------------------------
rat-excludes.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/39e111c0/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index 0b68379..1a3e199 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -25,6 +25,7 @@ Allura/allura/public/nf/css/forge/tooltipster.css
Allura/allura/public/nf/css/forge/ui.daterangepicker.css
Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
Allura/allura/public/nf/fonts/
+Allura/allura/public/nf/js/dummy.es6.js
Allura/allura/public/nf/js/jquery-base.js
Allura/allura/public/nf/js/jquery.daterangepicker.js
Allura/allura/public/nf/js/jquery.flot.js
[3/5] allura git commit: [#8027] correct licenses on some CSS & JS
files that were incorrect
Posted by br...@apache.org.
[#8027] correct licenses on some CSS & JS files that were incorrect
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/6dec15f8
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/6dec15f8
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/6dec15f8
Branch: refs/heads/db/8027
Commit: 6dec15f8738bcf2b9b5e4e5f615ffe7ce3d52e09
Parents: 95a369a
Author: Dave Brondsema <da...@brondsema.net>
Authored: Mon Nov 23 13:11:44 2015 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Nov 23 14:41:46 2015 -0500
----------------------------------------------------------------------
Allura/LICENSE | 6 +++
.../lib/widgets/resources/css/colorPicker.css | 43 ++++++++++++--------
.../widgets/resources/css/jqfontselector.css | 25 ++++--------
.../widgets/resources/css/jquery.tagsinput.css | 26 ++++++------
Allura/allura/public/nf/css/forge/hilite.css | 6 +++
.../allura/public/nf/js/pb.transformie.min.js | 32 ++++++++-------
LICENSE | 6 +++
rat-excludes.txt | 2 +
8 files changed, 84 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/6dec15f8/Allura/LICENSE
----------------------------------------------------------------------
diff --git a/Allura/LICENSE b/Allura/LICENSE
index cda6b5a..19b6233 100644
--- a/Allura/LICENSE
+++ b/Allura/LICENSE
@@ -225,9 +225,12 @@ under the MIT license. For details, see the individual files:
allura/lib/widgets/resources/css/autocomplete.css
allura/public/nf/css/forge/accordion.css
allura/lib/widgets/resources/js/jqfontselector.js
+ Allura/allura/lib/widgets/resources/css/jqfontselector.css
allura/lib/widgets/resources/js/jquery.autosize-min.js
allura/lib/widgets/resources/js/jquery.colorPicker.js
+ Allura/allura/lib/widgets/resources/css/jquery.colorPicker.css
allura/lib/widgets/resources/js/jquery.tagsinput.js
+ Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
allura/public/nf/js/jquery.flot.js
allura/public/nf/js/jquery.maxlength.min.js
allura/public/nf/js/jquery.viewport.js
@@ -235,6 +238,9 @@ under the MIT license. For details, see the individual files:
allura/public/nf/css/forge/tooltipster.css
allura/public/nf/js/jquery.tooltipster.js
+Transformie, which is available under the MIT license.
+For details, see allura/public/nf/js/pb.transformie.min.js
+
Blueprint, which is available under the MIT license.
For details, see allura/public/nf/css/blueprint/
http://git-wip-us.apache.org/repos/asf/allura/blob/6dec15f8/Allura/allura/lib/widgets/resources/css/colorPicker.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/colorPicker.css b/Allura/allura/lib/widgets/resources/css/colorPicker.css
index 3518917..5f4df22 100644
--- a/Allura/allura/lib/widgets/resources/css/colorPicker.css
+++ b/Allura/allura/lib/widgets/resources/css/colorPicker.css
@@ -1,21 +1,30 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+/**
+ * Really Simple Color Picker in jQuery
+ *
+ * Licensed under the MIT (MIT-LICENSE.txt) licenses.
+ *
+ * Copyright (c) 2008 Lakshan Perera (www.laktek.com)
+ * Daniel Lacy (daniellacy.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
div.colorPicker-picker {
height: 16px;
width: 16px;
http://git-wip-us.apache.org/repos/asf/allura/blob/6dec15f8/Allura/allura/lib/widgets/resources/css/jqfontselector.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/jqfontselector.css b/Allura/allura/lib/widgets/resources/css/jqfontselector.css
index eb7be7c..d4f9c20 100644
--- a/Allura/allura/lib/widgets/resources/css/jqfontselector.css
+++ b/Allura/allura/lib/widgets/resources/css/jqfontselector.css
@@ -1,20 +1,11 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+/**
+* Font selector plugin
+* turns an ordinary input field into a list of web-safe fonts
+* Usage: $('select').fontSelector();
+*
+* Author : James Carmichael
+* Website : www.siteclick.co.uk
+* License : MIT
*/
ul.fontselector {
background: white;
http://git-wip-us.apache.org/repos/asf/allura/blob/6dec15f8/Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css b/Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
index ad836f6..a07129d 100644
--- a/Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
+++ b/Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
@@ -1,21 +1,19 @@
/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ jQuery Tags Input Plugin 1.3.3
+
+ Copyright (c) 2011 XOXCO, Inc
+
+ Documentation for this plugin lives here:
+ http://xoxco.com/clickable/jquery-tags-input
+
+ Licensed under the MIT license:
+ http://www.opensource.org/licenses/mit-license.php
+
+ ben@xoxco.com
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
*/
+
div.tagsinput { padding:5px; width:300px; height:100px; overflow-y: auto;}
div.tagsinput span.tag { border: 1px solid #0077AA; -moz-border-radius:2px; -webkit-border-radius:2px; display: block; float: left; padding: 5px; text-decoration:none; background: #eeeeff; margin-right: 5px; margin-bottom:5px;font-family: helvetica; font-size:13px;}
div.tagsinput span.tag:hover { background-color: #ebebeb; }
http://git-wip-us.apache.org/repos/asf/allura/blob/6dec15f8/Allura/allura/public/nf/css/forge/hilite.css
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/css/forge/hilite.css b/Allura/allura/public/nf/css/forge/hilite.css
index edd7f49..679cfe0 100644
--- a/Allura/allura/public/nf/css/forge/hilite.css
+++ b/Allura/allura/public/nf/css/forge/hilite.css
@@ -19,6 +19,11 @@
.linenodiv pre, code { font-size:127% }
.linenodiv pre { color: gray }
+
+
+/* this section generated with:
+ `pygmentize -f html -S default -a .codehilite`
+*/
.codehilite .hll { background-color: #ffffcc }
.codehilite { background: #f8f8f8; }
.codehilite .c { color: #408080; font-style: italic } /* Comment */
@@ -81,6 +86,7 @@
.codehilite .vi { color: #19177C } /* Name.Variable.Instance */
.codehilite .il { color: #666666 } /* Literal.Number.Integer.Long */
+
.codehilite { overflow: auto; }
.codehilite pre { margin:0; word-wrap: normal; }
.codehilite div { margin:0; padding: 0; }
http://git-wip-us.apache.org/repos/asf/allura/blob/6dec15f8/Allura/allura/public/nf/js/pb.transformie.min.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/pb.transformie.min.js b/Allura/allura/public/nf/js/pb.transformie.min.js
index 9759054..b912d94 100755
--- a/Allura/allura/public/nf/js/pb.transformie.min.js
+++ b/Allura/allura/public/nf/js/pb.transformie.min.js
@@ -1,20 +1,24 @@
/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
+Copyright (c) 2007 Paul Bakaus, http://paulbakaus.com/
- http://www.apache.org/licenses/LICENSE-2.0
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
jQuery(function(){if(!jQuery.browser.msie)return;if(Number(jQuery.browser.version)>=9)return;if(Transformie.stylesheets)
http://git-wip-us.apache.org/repos/asf/allura/blob/6dec15f8/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 276495f..4e5a5ba 100644
--- a/LICENSE
+++ b/LICENSE
@@ -226,9 +226,12 @@ under the MIT license. For details, see the individual files:
Allura/allura/lib/widgets/resources/css/autocomplete.css
Allura/allura/public/nf/css/forge/accordion.css
Allura/allura/lib/widgets/resources/js/jqfontselector.js
+ Allura/allura/lib/widgets/resources/css/jqfontselector.css
Allura/allura/lib/widgets/resources/js/jquery.autosize-min.js
Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js
+ Allura/allura/lib/widgets/resources/css/jquery.colorPicker.css
Allura/allura/lib/widgets/resources/js/jquery.tagsinput.js
+ Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
Allura/allura/public/nf/js/jquery.flot.js
Allura/allura/public/nf/js/jquery.maxlength.min.js
allura/public/nf/js/jquery.viewport.js
@@ -238,6 +241,9 @@ under the MIT license. For details, see the individual files:
Allura/allura/public/nf/css/forge/tooltipster.css
Allura/allura/public/nf/js/jquery.tooltipster.js
+Transformie (https://github.com/pbakaus/transformie/), which is available under the MIT license.
+For details, see Allura/allura/public/nf/js/pb.transformie.min.js
+
Blueprint, which is available under the MIT license.
For details, see Allura/allura/public/nf/css/blueprint/
http://git-wip-us.apache.org/repos/asf/allura/blob/6dec15f8/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index 6fbe5bb..f90669f 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -9,6 +9,8 @@
Allura/allura/etc/mime.types
Allura/allura/lib/AsciiDammit.py
Allura/allura/lib/widgets/resources/css/autocomplete.css
+Allura/allura/lib/widgets/resources/css/jqfontselector.css
+Allura/allura/lib/widgets/resources/css/jquery.tagsinput.css
Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
Allura/allura/lib/widgets/resources/css/simplemde.min.css
Allura/allura/lib/widgets/resources/js/jqfontselector.js
[5/5] allura git commit: [#8027] update copyright year
Posted by br...@apache.org.
[#8027] update copyright year
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/179bf1e3
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/179bf1e3
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/179bf1e3
Branch: refs/heads/db/8027
Commit: 179bf1e38d0c8c6e94f521ce9d6f4f69a4e4954b
Parents: 39e111c
Author: Dave Brondsema <da...@brondsema.net>
Authored: Mon Nov 23 14:44:29 2015 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Nov 23 14:44:29 2015 -0500
----------------------------------------------------------------------
Allura/NOTICE | 2 +-
ForgeDiscussion/NOTICE | 2 +-
ForgeGit/NOTICE | 2 +-
ForgeImporters/NOTICE | 2 +-
ForgeImporters/docs/conf.py | 2 +-
ForgeLink/NOTICE | 2 +-
ForgeSVN/NOTICE | 2 +-
ForgeTracker/NOTICE | 2 +-
ForgeWiki/NOTICE | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/179bf1e3/Allura/NOTICE
----------------------------------------------------------------------
diff --git a/Allura/NOTICE b/Allura/NOTICE
index 69af9fe..fb04ff5 100644
--- a/Allura/NOTICE
+++ b/Allura/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/179bf1e3/ForgeDiscussion/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/NOTICE b/ForgeDiscussion/NOTICE
index 69af9fe..fb04ff5 100644
--- a/ForgeDiscussion/NOTICE
+++ b/ForgeDiscussion/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/179bf1e3/ForgeGit/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeGit/NOTICE b/ForgeGit/NOTICE
index 69af9fe..fb04ff5 100644
--- a/ForgeGit/NOTICE
+++ b/ForgeGit/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/179bf1e3/ForgeImporters/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeImporters/NOTICE b/ForgeImporters/NOTICE
index 69af9fe..fb04ff5 100644
--- a/ForgeImporters/NOTICE
+++ b/ForgeImporters/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/179bf1e3/ForgeImporters/docs/conf.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/docs/conf.py b/ForgeImporters/docs/conf.py
index 7783282..fbd5baf 100644
--- a/ForgeImporters/docs/conf.py
+++ b/ForgeImporters/docs/conf.py
@@ -54,7 +54,7 @@ master_doc = 'index'
# General information about the project.
project = 'Apache Allura'
-copyright = '2012-2014 The Apache Software Foundation'
+copyright = '2012-2015 The Apache Software Foundation'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
http://git-wip-us.apache.org/repos/asf/allura/blob/179bf1e3/ForgeLink/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeLink/NOTICE b/ForgeLink/NOTICE
index 69af9fe..fb04ff5 100644
--- a/ForgeLink/NOTICE
+++ b/ForgeLink/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/179bf1e3/ForgeSVN/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeSVN/NOTICE b/ForgeSVN/NOTICE
index 69af9fe..fb04ff5 100644
--- a/ForgeSVN/NOTICE
+++ b/ForgeSVN/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/179bf1e3/ForgeTracker/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeTracker/NOTICE b/ForgeTracker/NOTICE
index 69af9fe..fb04ff5 100644
--- a/ForgeTracker/NOTICE
+++ b/ForgeTracker/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/179bf1e3/ForgeWiki/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeWiki/NOTICE b/ForgeWiki/NOTICE
index 69af9fe..fb04ff5 100644
--- a/ForgeWiki/NOTICE
+++ b/ForgeWiki/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[2/5] allura git commit: [#8027] remove Apache license headers from
Sphinx Makefile & make.bat files
Posted by br...@apache.org.
[#8027] remove Apache license headers from Sphinx Makefile & make.bat files
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/89ff9f3e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/89ff9f3e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/89ff9f3e
Branch: refs/heads/db/8027
Commit: 89ff9f3e0ba432c79c53ec80adae629ff7131c82
Parents: 6dec15f
Author: Dave Brondsema <da...@brondsema.net>
Authored: Mon Nov 23 13:50:22 2015 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon Nov 23 14:41:46 2015 -0500
----------------------------------------------------------------------
Allura/LICENSE | 2 +-
Allura/docs/Makefile | 17 ---
Allura/docs/make.bat | 17 ---
ForgeImporters/LICENSE | 214 ++++++++++++++++++++++++++++++++++++++
ForgeImporters/NOTICE | 5 +
ForgeImporters/docs/Makefile | 17 ---
ForgeImporters/docs/make.bat | 17 ---
LICENSE | 6 ++
rat-excludes.txt | 4 +
9 files changed, 230 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/89ff9f3e/Allura/LICENSE
----------------------------------------------------------------------
diff --git a/Allura/LICENSE b/Allura/LICENSE
index 19b6233..a194b41 100644
--- a/Allura/LICENSE
+++ b/Allura/LICENSE
@@ -238,7 +238,7 @@ under the MIT license. For details, see the individual files:
allura/public/nf/css/forge/tooltipster.css
allura/public/nf/js/jquery.tooltipster.js
-Transformie, which is available under the MIT license.
+Transformie (https://github.com/pbakaus/transformie/), which is available under the MIT license.
For details, see allura/public/nf/js/pb.transformie.min.js
Blueprint, which is available under the MIT license.
http://git-wip-us.apache.org/repos/asf/allura/blob/89ff9f3e/Allura/docs/Makefile
----------------------------------------------------------------------
diff --git a/Allura/docs/Makefile b/Allura/docs/Makefile
index b3ca8af..eb184b7 100644
--- a/Allura/docs/Makefile
+++ b/Allura/docs/Makefile
@@ -1,20 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
# Makefile for Sphinx documentation
# You can set these variables from the command line.
http://git-wip-us.apache.org/repos/asf/allura/blob/89ff9f3e/Allura/docs/make.bat
----------------------------------------------------------------------
diff --git a/Allura/docs/make.bat b/Allura/docs/make.bat
index 611d010..10b364d 100644
--- a/Allura/docs/make.bat
+++ b/Allura/docs/make.bat
@@ -1,22 +1,5 @@
@ECHO OFF
-REM Licensed to the Apache Software Foundation (ASF) under one
-REM or more contributor license agreements. See the NOTICE file
-REM distributed with this work for additional information
-REM regarding copyright ownership. The ASF licenses this file
-REM to you under the Apache License, Version 2.0 (the
-REM "License"); you may not use this file except in compliance
-REM with the License. You may obtain a copy of the License at
-
-REM http://www.apache.org/licenses/LICENSE-2.0
-
-REM Unless required by applicable law or agreed to in writing,
-REM software distributed under the License is distributed on an
-REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-REM KIND, either express or implied. See the License for the
-REM specific language governing permissions and limitations
-REM under the License.
-
REM Command file for Sphinx documentation
set SPHINXBUILD=sphinx-build
http://git-wip-us.apache.org/repos/asf/allura/blob/89ff9f3e/ForgeImporters/LICENSE
----------------------------------------------------------------------
diff --git a/ForgeImporters/LICENSE b/ForgeImporters/LICENSE
new file mode 100644
index 0000000..3e03b1e
--- /dev/null
+++ b/ForgeImporters/LICENSE
@@ -0,0 +1,214 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+THIRD-PARTY DEPENDENCIES:
+
+Apache Allura includes a number of third-party dependencies with
+separate copyright notices and license terms. Your use of the source code
+for the these dependencies is subject to the terms and conditions of the
+following licenses.
+
+Build scripts from Sphinx (http://sphinx-doc.org/):
+ docs/make.bat
+ docs/Makefile
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/allura/blob/89ff9f3e/ForgeImporters/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeImporters/NOTICE b/ForgeImporters/NOTICE
new file mode 100644
index 0000000..69af9fe
--- /dev/null
+++ b/ForgeImporters/NOTICE
@@ -0,0 +1,5 @@
+Apache Allura
+Copyright 2012-2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/89ff9f3e/ForgeImporters/docs/Makefile
----------------------------------------------------------------------
diff --git a/ForgeImporters/docs/Makefile b/ForgeImporters/docs/Makefile
index b3ca8af..eb184b7 100644
--- a/ForgeImporters/docs/Makefile
+++ b/ForgeImporters/docs/Makefile
@@ -1,20 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
# Makefile for Sphinx documentation
# You can set these variables from the command line.
http://git-wip-us.apache.org/repos/asf/allura/blob/89ff9f3e/ForgeImporters/docs/make.bat
----------------------------------------------------------------------
diff --git a/ForgeImporters/docs/make.bat b/ForgeImporters/docs/make.bat
index 611d010..10b364d 100644
--- a/ForgeImporters/docs/make.bat
+++ b/ForgeImporters/docs/make.bat
@@ -1,22 +1,5 @@
@ECHO OFF
-REM Licensed to the Apache Software Foundation (ASF) under one
-REM or more contributor license agreements. See the NOTICE file
-REM distributed with this work for additional information
-REM regarding copyright ownership. The ASF licenses this file
-REM to you under the Apache License, Version 2.0 (the
-REM "License"); you may not use this file except in compliance
-REM with the License. You may obtain a copy of the License at
-
-REM http://www.apache.org/licenses/LICENSE-2.0
-
-REM Unless required by applicable law or agreed to in writing,
-REM software distributed under the License is distributed on an
-REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-REM KIND, either express or implied. See the License for the
-REM specific language governing permissions and limitations
-REM under the License.
-
REM Command file for Sphinx documentation
set SPHINXBUILD=sphinx-build
http://git-wip-us.apache.org/repos/asf/allura/blob/89ff9f3e/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 4e5a5ba..2904c2e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -269,3 +269,9 @@ SimpleMDE markdown editor (https://github.com/NextStepWebs/simplemde-markdown-ed
license. For details, see:
Allura/allura/lib/widgets/resources/js/simplemde.min.js
Allura/allura/lib/widgets/resources/css/simplemde.min.css
+
+Build scripts from Sphinx (http://sphinx-doc.org/):
+ Allura/docs/make.bat
+ Allura/docs/Makefile
+ ForgeImporters/docs/make.bat
+ ForgeImporters/docs/Makefile
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/allura/blob/89ff9f3e/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index f90669f..0b68379 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -37,11 +37,15 @@ Allura/allura/public/nf/js/react.min.js
Allura/allura/public/nf/js/sylvester.js
Allura/allura/tests/data/genshi_hello_tmpl
Allura/allura/tests/data/test_mime/text_file.txt
+Allura/docs/make.bat
+Allura/docs/Makefile
Allura/docs/_build/
Allura/run/dummy.txt
AlluraTest/jslint/
CHANGES
ForgeGit/forgegit/data/post-receive_tmpl
+ForgeImporters/docs/make.bat
+ForgeImporters/docs/Makefile
ForgeImporters/forgeimporters/tests/data/google/empty-issue.html
ForgeImporters/forgeimporters/tests/data/google/test-issue-first-page.html
ForgeImporters/forgeimporters/tests/data/google/test-issue-prev-page.html