[cc-commits] [SCM] cc.engine: License chooser, public domain chooser, deeds (branch next) updated. 723e4be63b54a015fda80e1a87a18ec199007d1d
Gitosis User
git at gandi0.creativecommons.org
Thu Jan 12 16:02:33 EST 2012
The branch, next has been updated
via 723e4be63b54a015fda80e1a87a18ec199007d1d (commit)
via 9de8c826bf7eac8da78c7493483358fc97d15dbb (commit)
via 3fd160008aec0ca260b4eb8f02bfb7ea2be2c96a (commit)
via a37583ee30145e01ccf70f4c58686612cff58c91 (commit)
via 5e9ee44ddf0a74aefb9f9d4d3ea3b6eaa246e1a7 (commit)
via 6c95218db9202024f2767b04497644db9d595acb (commit)
via 8a38eccdd76fe291405cfeebde7989267c88b61f (commit)
via ae1d454bcabfb70e8adf88908dd63f4a5d389756 (commit)
via aba430c2d4b3b981f785cf3e99e5ccec9b2607a2 (commit)
from 99b52d506c53384bc87e85d4b9c0b9b51809efb0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 723e4be63b54a015fda80e1a87a18ec199007d1d
Author: Christopher Allan Webber <cwebber at dustycloud.org>
Date: Thu Jan 12 15:02:56 2012 -0600
Removing superfluous slash from marking link in header
commit 9de8c826bf7eac8da78c7493483358fc97d15dbb
Merge: 3fd1600 99b52d5
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date: Tue Jan 10 17:28:39 2012 -0600
Merge branch 'next'
commit 3fd160008aec0ca260b4eb8f02bfb7ea2be2c96a
Merge: a37583e e483934
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date: Tue Jan 10 14:16:00 2012 -0600
Merge branch 'next'
commit a37583ee30145e01ccf70f4c58686612cff58c91
Author: Nathan Kinkade <nkinkade at creativecommons.org>
Date: Wed Dec 21 12:30:58 2011 -0500
Revert "Added a temporary Stop SOPA header to chooser."
This reverts commit 39080e5798720dc6f242aba339b13dafc07b73e5.
commit 5e9ee44ddf0a74aefb9f9d4d3ea3b6eaa246e1a7
Author: Nathan Kinkade <nkinkade at creativecommons.org>
Date: Wed Dec 21 12:30:44 2011 -0500
Revert "Added Stop SOPA header to deeds."
This reverts commit 0efb141a92e2cdbf57ab52375f5d0a151c3735af.
commit 6c95218db9202024f2767b04497644db9d595acb
Merge: 8a38ecc 0efb141
Author: Nathan Kinkade <nkinkade at creativecommons.org>
Date: Wed Dec 14 16:35:39 2011 -0500
Merge commit '0efb141a92e2cdbf57ab52375f5d0a151c3735af'
commit 8a38eccdd76fe291405cfeebde7989267c88b61f
Merge: ae1d454 39080e5
Author: Nathan Kinkade <nkinkade at creativecommons.org>
Date: Wed Dec 14 16:06:32 2011 -0500
Merge commit '39080e5798720dc6f242aba339b13dafc07b73e5'
commit ae1d454bcabfb70e8adf88908dd63f4a5d389756
Merge: aba430c 27426b8
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date: Thu Dec 1 15:54:03 2011 -0600
Merge branch 'next'
commit aba430c2d4b3b981f785cf3e99e5ccec9b2607a2
Author: Jonathan Palecek <jonathan at creativecommons.org>
Date: Thu Dec 1 15:16:14 2011 -0600
updated test_send_license_info_email for annual campaign
-----------------------------------------------------------------------
Summary of changes (followed by patch):
cc/engine/templates/macros_templates/engine.html | 2 +-
cc/engine/tests/test_util.py | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/cc/engine/templates/macros_templates/engine.html b/cc/engine/templates/macros_templates/engine.html
index 834bee6..2fea3dd 100644
--- a/cc/engine/templates/macros_templates/engine.html
+++ b/cc/engine/templates/macros_templates/engine.html
@@ -94,7 +94,7 @@
<li><span>Licensors</span></li>
<li><a href="http://wiki.creativecommons.org/Before_Licensing">Things to know before licensing</a></li>
<li><a href="http://wiki.creativecommons.org/FAQ#Do_I_need_to_sign_something_or_register_to_obtain_a_Creative_Commons_license.3F">Do I need to register my work?</a></li>
- <li><a href="http://wiki.creativecommons.org/Marking/">Marking my work</a></li>
+ <li><a href="http://wiki.creativecommons.org/Marking">Marking my work</a></li>
<li class="divider"></li>
<li><span>Licensees</span></li>
diff --git a/cc/engine/tests/test_util.py b/cc/engine/tests/test_util.py
index cbe8297..ff62044 100644
--- a/cc/engine/tests/test_util.py
+++ b/cc/engine/tests/test_util.py
@@ -137,7 +137,8 @@ def test_send_license_info_email():
assert message['From'] == "info at creativecommons.org"
assert message['To'] == "ilovesillylicenses at example.org"
assert message['Subject'] == "Your Creative Commons License Information"
- assert message.get_payload() == """Thank you for using a Creative Commons legal tool for your work.
+
+ normal_payload = """Thank you for using a Creative Commons legal tool for your work.
You have selected Creative Commons Very-Silly License 5.8.
You should include a reference to this on the web page that includes
@@ -155,6 +156,10 @@ metadata can be found at http://wiki.creativecommons.org/CC_REL.
Thank you!
Creative Commons Support
info at creativecommons.org"""
+ campaign_payload = """Thank you for using a Creative Commons legal tool for your work.\n\nYou have selected Creative Commons Very-Silly License 5.8.\nYou should include a reference to this on the web page that includes\nthe work in question.\n\nHere is the suggested HTML:\n\nThis work available under a\n<a href="http://example.org/goes/nowhere">very silly license</a>.\n\nTips for marking your work can be found at\nhttp://wiki.creativecommons.org/Marking. Information on the supplied HTML and\nmetadata can be found at http://wiki.creativecommons.org/CC_REL.\n\nThis email and tech support has been brought to you by the nonprofit folks at\nCreative Commons. CC relies on donations to provide you with licenses and\nservices like this. Please consider a donation to our annual fund:\nhttps://creativecommons.net/donate.\n\nThank you!\nCreative Commons Support\ninfo at creativecommons.org"""
+
+ assert message.get_payload() in [normal_payload, campaign_payload]
+
def test_subset_dict():
hooks/post-receive
--
cc.engine: License chooser, public domain chooser, deeds
More information about the cc-commits
mailing list