EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ku

pull/95/head
eric 2018-11-01 14:29:52 -04:00
parent 3697789274 d2f3ae5c2b
commit 6c2b07b053
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/templates/ebookfiles.html
View File

@ -10,7 +10,6 @@
<li>an acknowledgement of Ungluers of the work, formatted in accordance with the premium descriptions on the Campaign page.</li>
<li>The Unglue.it logo</li>
<li>the text “CC edition release enabled by Unglue.it users” (including the hyperlink to the site)</li>
<li>The Rights Holder must offer the schedule of Standard Premiums as described at at ( <a href="https://unglue.it/rightsholders/">https://unglue.it/rightsholders/</a>) in effect at the time of launching a Pledge Campaign.</li>
</ol>
</li>
<li><i>For Buy-To-Unglue Campaigns</i>, the Unglue.it platform will embed a personalized licensed statement into front matter for each delivered file</li>

2
frontend/templates/home.html
View File

@ -219,7 +219,7 @@ function put_un_in_cookie2(){
<div class="jsmodule">
<h3 class="module-title">News</h3>
<div class="jsmod-content">
<a href="https://blog.unglue.it/2018/01/24/unglue-it-has-resumed-crowdfunding/">Unglue.it has resumed crowdfunding</a>
<a href="https://blog.unglue.it/2018/10/29/57000-free-gitenberg-ebooks-are-now-in-unglue-it/">57,000 free GITenberg ebooks are now in Unglue.it</a>
</div>
</div>
<div class="jsmodule">

2
frontend/templates/manage_campaign.html
View File

@ -422,7 +422,7 @@ Please fix the following before launching your campaign:
</ul>
<h4>Acknowledgements</h4>
<p>Your ungluers (including thos who use donations, will also automatically receive the following acknowledgements:</p>
<p>Your ungluers (including those who use donations, will also automatically receive the following acknowledgements:</p>
<ul class="terms">
<li><em>Any amount</em> &#8212; The unglued ebook</li>
<li><em>$25 and above</em> &#8212; Their name in the acknowledgements section under "supporters"</li>

10
requirements_versioned.pip
View File

@ -44,7 +44,7 @@ django-tastypie==0.14.1
git+git://github.com/resulto/django-transmeta.git@ad4d7278ba330dcf8c8446f8ae9b2c769ae8684e
#fef-questionnaire==4.0.1
git+git://github.com/EbookFoundation/fef-questionnaire.git@8c3b630eb6171fe9242bf0d3b456dc41de958006
gitberg==0.4.2
gitberg==0.5.2
github3.py>=1.0.0
html5lib==1.0.1
httplib2==0.11.3
@ -71,12 +71,12 @@ python-mimeparse==0.1.4
python-openid==2.2.5
social-auth-core==1.7.0
social-auth-app-django==2.1.0
pytz==2016.6.1
pytz>=2016.6.1
rdflib==4.2.0
rdflib-jsonld==0.3
redis==2.10.3
reportlab==3.4.0
requests==2.18.4
requests>=2.20.0
requests-mock==1.2.0
requests-oauthlib==0.6.2
selenium==2.53.1
@ -90,7 +90,7 @@ stevedore==1.12.0
stripe==1.9.1
tox>=2.5.0
uritemplate.py>=0.3.0
virtualenv==1.4.9
virtualenv>=1.4.9
# virtualenv-clone==0.2.4 not sure why I have this in my env
#virtualenvwrapper==3.6
wsgiref==0.1.2
@ -106,7 +106,7 @@ idna==2.6
ipaddress==1.0.16
ndg-httpsclient==0.5.1
pyOpenSSL==18.0.0
pyasn1==0.1.9
pyasn1>=0.4.2
pycparser>=2.17
setuptools==25.0.0
urllib3==1.22