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 2013/05/23 21:45:38 UTC
[1/2] git commit: add license to new files,
ignore some generated files
Updated Branches:
refs/heads/master d412205eb -> 53d8b05c2
add license to new files, ignore some generated files
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/6702bc7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/6702bc7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/6702bc7b
Branch: refs/heads/master
Commit: 6702bc7bf1ff2ba53daf2fbe05bf1357217508ab
Parents: d412205
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Thu May 23 15:15:54 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu May 23 15:45:27 2013 -0400
----------------------------------------------------------------------
Allura/allura/templates/macro/__init__.py | 17 +++++++++++++-
Allura/allura/templates/macro/blog_posts.html | 18 +++++++++++++++
Allura/allura/templates/macro/members.html | 18 +++++++++++++++
.../allura/templates/macro/neighborhood_feeds.html | 18 +++++++++++++++
Allura/allura/templates/macro/project_admins.html | 18 +++++++++++++++
Allura/docs/api/app.rst | 17 ++++++++++++++
Allura/docs/api/controllers.rst | 18 ++++++++++++++-
ForgeDiscussion/forgediscussion/site_stats.py | 17 ++++++++++++++
ForgeTracker/forgetracker/data/mass_report | 18 +++++++++++++++
ForgeTracker/forgetracker/site_stats.py | 17 ++++++++++++++
rat-excludes.txt | 4 ++-
11 files changed, 177 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6702bc7b/Allura/allura/templates/macro/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/macro/__init__.py b/Allura/allura/templates/macro/__init__.py
index 8b13789..144e298 100644
--- a/Allura/allura/templates/macro/__init__.py
+++ b/Allura/allura/templates/macro/__init__.py
@@ -1 +1,16 @@
-
+# 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.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6702bc7b/Allura/allura/templates/macro/blog_posts.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/macro/blog_posts.html b/Allura/allura/templates/macro/blog_posts.html
index c5213bb..52d9aa9 100644
--- a/Allura/allura/templates/macro/blog_posts.html
+++ b/Allura/allura/templates/macro/blog_posts.html
@@ -1,3 +1,21 @@
+{#-
+ 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.
+-#}
{% for post in posts %}
<div class="neighborhood_feed_entry">
<h3><a href="{{post.href}}">{{post.title}}</a></h3>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6702bc7b/Allura/allura/templates/macro/members.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/macro/members.html b/Allura/allura/templates/macro/members.html
index 440760c..8ed27fc 100644
--- a/Allura/allura/templates/macro/members.html
+++ b/Allura/allura/templates/macro/members.html
@@ -1,3 +1,21 @@
+{#-
+ 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.
+-#}
<h6>Project Members:</h6>
<ul class="md-users-list">
{% for user in users -%}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6702bc7b/Allura/allura/templates/macro/neighborhood_feeds.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/macro/neighborhood_feeds.html b/Allura/allura/templates/macro/neighborhood_feeds.html
index 7a23126..530f950 100644
--- a/Allura/allura/templates/macro/neighborhood_feeds.html
+++ b/Allura/allura/templates/macro/neighborhood_feeds.html
@@ -1,3 +1,21 @@
+{#-
+ 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.
+-#}
<div class="neighborhood_feed_entry">
{% for feed in feeds%}
<h3><a href="{{feed.href}}">{{feed.title}}</a></h3>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6702bc7b/Allura/allura/templates/macro/project_admins.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/macro/project_admins.html b/Allura/allura/templates/macro/project_admins.html
index 2b346bc..0329b56 100644
--- a/Allura/allura/templates/macro/project_admins.html
+++ b/Allura/allura/templates/macro/project_admins.html
@@ -1,3 +1,21 @@
+{#-
+ 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.
+-#}
<h6>Project Admins:</h6>
<ul class="md-users-list">
{% for user in users -%}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6702bc7b/Allura/docs/api/app.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/api/app.rst b/Allura/docs/api/app.rst
index 7fcd90b..31a94f2 100644
--- a/Allura/docs/api/app.rst
+++ b/Allura/docs/api/app.rst
@@ -1,3 +1,20 @@
+.. 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.
+
.. _app_module:
:mod:`allura.app`
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6702bc7b/Allura/docs/api/controllers.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/api/controllers.rst b/Allura/docs/api/controllers.rst
index 5e56976..2595a07 100644
--- a/Allura/docs/api/controllers.rst
+++ b/Allura/docs/api/controllers.rst
@@ -1,3 +1,20 @@
+.. 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.
+
.. _controllers_module:
:mod:`allura.controllers`
@@ -9,4 +26,3 @@
.. autoclass:: RestController
:members:
-
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6702bc7b/ForgeDiscussion/forgediscussion/site_stats.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/site_stats.py b/ForgeDiscussion/forgediscussion/site_stats.py
index e76201d..6918137 100644
--- a/ForgeDiscussion/forgediscussion/site_stats.py
+++ b/ForgeDiscussion/forgediscussion/site_stats.py
@@ -1,3 +1,20 @@
+# 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.
+
from datetime import datetime, timedelta
from . import model as DM
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6702bc7b/ForgeTracker/forgetracker/data/mass_report
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/data/mass_report b/ForgeTracker/forgetracker/data/mass_report
index faddde2..7e8e47d 100644
--- a/ForgeTracker/forgetracker/data/mass_report
+++ b/ForgeTracker/forgetracker/data/mass_report
@@ -1,3 +1,21 @@
+{#-
+ 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.
+-#}
{{ data.header }}
{% for ticket, change_text in data.changes %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6702bc7b/ForgeTracker/forgetracker/site_stats.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/site_stats.py b/ForgeTracker/forgetracker/site_stats.py
index e0baa63..f9f36ce 100644
--- a/ForgeTracker/forgetracker/site_stats.py
+++ b/ForgeTracker/forgetracker/site_stats.py
@@ -1,3 +1,20 @@
+# 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.
+
from datetime import datetime, timedelta
from bson import ObjectId
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6702bc7b/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index bae4984..5b3677a 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -5,7 +5,9 @@ rat-excludes.txt
**/*.egg-info/
requirements*
**/MANIFEST.in
-**/test.log
+**/*.log
+**/.coverage
+**/nosetests.xml
Allura/allura/controllers/controller.template
Allura/docs/_build/
Allura/allura/etc/mime.types
[2/2] git commit: ignore two MIT-licensed JS libraries
Posted by br...@apache.org.
ignore two MIT-licensed JS libraries
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/53d8b05c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/53d8b05c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/53d8b05c
Branch: refs/heads/master
Commit: 53d8b05c2e35ef00123703e8da8f71d9c605a898
Parents: 6702bc7
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Thu May 23 15:44:45 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu May 23 15:45:28 2013 -0400
----------------------------------------------------------------------
rat-excludes.txt | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/53d8b05c/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index 5b3677a..49e640b 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -16,6 +16,7 @@ Allura/allura/lib/widgets/resources/css/autocomplete.css
Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.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/jquery.textarea.js
Allura/allura/lib/widgets/resources/js/jquery.tools.min.js
@@ -27,6 +28,7 @@ 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/spin.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/run/dummy.txt
@@ -36,4 +38,3 @@ ForgeSVN/forgesvn/tests/data/testsvn/
solr_config/core0/conf/spellings.txt
solr_config/core1/conf/spellings.txt
solr_config/solr.xml
-