[Python-modules-commits] [python-django-crispy-forms] 05/10: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Fri Oct 28 06:42:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-django-crispy-forms.
commit b3d1622c726e082ad437ae205193f0295c6e2bd3
Merge: 9ebdd8c a0db01f
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Thu Oct 27 14:19:39 2016 +0200
merge patched into master
.github/ISSUE_TEMPLATE.md | 14 +++
.travis.yml | 7 ++
CHANGELOG.md | 9 ++
CONTRIBUTORS.txt | 1 +
MANIFEST.in | 2 +-
README.rst | 12 +--
crispy_forms/__init__.py | 2 +-
crispy_forms/bootstrap.py | 4 +-
crispy_forms/templates/bootstrap/field.html | 2 +-
.../templates/bootstrap/layout/buttonholder.html | 4 +
.../templates/bootstrap/table_inline_formset.html | 2 +-
crispy_forms/templates/bootstrap3/field.html | 2 +-
.../bootstrap3/layout/prepended_appended_text.html | 2 +-
.../templates/bootstrap3/table_inline_formset.html | 2 +-
crispy_forms/templates/bootstrap4/field.html | 12 +--
crispy_forms/templates/bootstrap4/inputs.html | 6 +-
.../bootstrap4/layout/checkboxselectmultiple.html | 2 +-
.../layout/checkboxselectmultiple_inline.html | 4 +-
.../bootstrap4/layout/field_with_buttons.html | 6 +-
.../templates/bootstrap4/layout/formactions.html | 6 +-
.../templates/bootstrap4/layout/help_text.html | 4 +-
.../bootstrap4/layout/prepended_appended_text.html | 6 +-
.../templates/bootstrap4/layout/radioselect.html | 2 +-
.../bootstrap4/layout/radioselect_inline.html | 4 +-
.../bootstrap4/layout/uneditable_input.html | 6 +-
.../templates/bootstrap4/table_inline_formset.html | 4 +-
crispy_forms/templatetags/crispy_forms_field.py | 2 +
crispy_forms/templatetags/crispy_forms_tags.py | 7 +-
.../custom_form_template_with_context.html | 4 +
crispy_forms/tests/test_form_helper.py | 104 +++++++++++++++++++--
crispy_forms/tests/test_layout.py | 11 +--
crispy_forms/tests/test_layout_objects.py | 4 +-
debian/.git-dpm | 6 +-
debian/patches/no-remote-resources.patch | 6 +-
docs/install.rst | 9 +-
setup.cfg | 5 +
tox.ini | 4 +-
37 files changed, 210 insertions(+), 79 deletions(-)
diff --cc debian/.git-dpm
index 50b476d,0000000..a669c7a
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- e19596362921c6a9e8db689aba455e14a8d6b294
- e19596362921c6a9e8db689aba455e14a8d6b294
- 8d1af358bbc8ff4c43719425776ce42abba63cde
++a0db01f79371dd6b0641bedebe4b26a3f755c2ee
++a0db01f79371dd6b0641bedebe4b26a3f755c2ee
++1c49d96375e4dde6f4c880d772640ddfb1381594
+1c49d96375e4dde6f4c880d772640ddfb1381594
+python-django-crispy-forms_1.6.1.orig.tar.gz
+2809a1739e746bfaf64249832c50bc37d7a143ab
+155702
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/no-remote-resources.patch
index 7e05577,0000000..4223968
mode 100644,000000..100644
--- a/debian/patches/no-remote-resources.patch
+++ b/debian/patches/no-remote-resources.patch
@@@ -1,55 -1,0 +1,55 @@@
- From e19596362921c6a9e8db689aba455e14a8d6b294 Mon Sep 17 00:00:00 2001
++From a0db01f79371dd6b0641bedebe4b26a3f755c2ee Mon Sep 17 00:00:00 2001
+From: Jan Dittberner <jandd at debian.org>
+Date: Sat, 11 Oct 2014 17:59:23 +0200
+Subject: remove remote resource references to avoid privacy issues
+
+Patch-Name: no-remote-resources.patch
+---
+ docs/_templates/sidebarintro.html | 9 ---------
+ docs/_themes/kr/layout.html | 11 -----------
+ 2 files changed, 20 deletions(-)
+
+diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
- index 11f654e..ecd71b0 100644
++index 625b333..ecd71b0 100644
+--- a/docs/_templates/sidebarintro.html
++++ b/docs/_templates/sidebarintro.html
+@@ -1,8 +1,4 @@
+ <h3 style="font-size: 30px;"><a href="{{ pathto(master_doc) }}">crispy-forms</a></h3>
+-<p>
+- <iframe src="http://ghbtns.com/github-btn.html?user=maraujop&repo=django-crispy-forms&type=watch&count=true&size=large"
+- allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
+-</p>
+
+ <p>
+ django-crispy-forms is a Django application that lets you easily build, customize and reuse forms using your favorite CSS framework, without writing template code and without having to take care of annoying details. You are currently looking at the documentation of the development release.
+@@ -13,8 +9,3 @@
+ <p>
+ If you love django-crispy-forms, consider making a small donation <a href="http://flattr.com/thing/512037/django-crispy-forms">on Flattr</a>:
+ </p>
+-<p>
- - <a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://django-crispy-forms.rtfd.org"></a>
++- <a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="https://django-crispy-forms.readthedocs.io"></a>
+- <noscript><a href="http://flattr.com/thing/512037/django-crispy-forms" target="_blank">
+- <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Click to flattr django-crispy-forms" border="0" /></a></noscript>
+-</p>
+diff --git a/docs/_themes/kr/layout.html b/docs/_themes/kr/layout.html
+index 4d50f1e..d7c8792 100644
+--- a/docs/_themes/kr/layout.html
++++ b/docs/_themes/kr/layout.html
+@@ -9,17 +9,6 @@
+ {% endblock %}
+ {%- block relbar2 %}{% endblock %}
+ {%- block footer %}
+- <script type="text/javascript">
+- /* <![CDATA[ */
+- (function() {
+- var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+- s.type = 'text/javascript';
+- s.async = true;
+- s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+- t.parentNode.insertBefore(s, t);
+- })();
+- /* ]]> */</script>
+-
+ <div class="footer">
+ © Copyright {{ copyright }}.
+ Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-crispy-forms.git
More information about the Python-modules-commits
mailing list