[Python-modules-commits] [python-django-crispy-forms] 04/09: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Wed Oct 14 11:05:04 UTC 2015
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 25f1329d32e39358baff456c1dde8a1cb0de936b
Merge: c421d30 d4597ac
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Wed Oct 14 11:55:21 2015 +0200
merge patched into master
.coveragerc | 2 +
.editorconfig | 18 +
.gitignore | 1 +
.travis.yml | 37 +-
CHANGELOG.md | 74 +-
CONTRIBUTORS.txt | 20 +-
LICENSE.txt | 2 +-
MANIFEST.in | 2 +-
Makefile | 6 +-
README.rst | 5 +-
crispy_forms/__init__.py | 2 +-
crispy_forms/base.py | 43 +-
crispy_forms/bootstrap.py | 205 ++--
crispy_forms/compatibility.py | 33 +
crispy_forms/helper.py | 77 +-
crispy_forms/layout.py | 181 ++--
crispy_forms/layout_slice.py | 4 +-
crispy_forms/templates/bootstrap/display_form.html | 1 +
crispy_forms/templates/bootstrap/field.html | 16 +-
crispy_forms/templates/bootstrap/layout/alert.html | 4 +-
.../{uni_form => bootstrap}/layout/div.html | 2 +-
.../templates/bootstrap/layout/fieldset.html | 6 +
.../bootstrap/layout/prepended_appended_text.html | 4 +-
.../templates/bootstrap/table_inline_formset.html | 26 +-
crispy_forms/templates/bootstrap/uni_form.html | 13 +-
.../templates/bootstrap3/display_form.html | 1 +
crispy_forms/templates/bootstrap3/field.html | 30 +-
crispy_forms/templates/bootstrap3/field.html.bk | 49 -
.../templates/bootstrap3/field.strict.html | 31 -
crispy_forms/templates/bootstrap3/inputs.html | 13 +
.../templates/bootstrap3/layout/alert.html | 4 +
.../bootstrap3/layout/checkboxselectmultiple.html | 5 +-
.../{uni_form => bootstrap3}/layout/div.html | 2 +-
.../templates/bootstrap3/layout/fieldset.html | 6 +
.../templates/bootstrap3/layout/formactions.html | 10 +-
.../templates/bootstrap3/layout/inline_field.html | 2 +-
.../bootstrap3/layout/prepended_appended_text.html | 14 +-
.../templates/bootstrap3/layout/radioselect.html | 4 +-
.../bootstrap3/layout/radioselect_inline.html | 2 +-
.../templates/bootstrap3/table_inline_formset.html | 33 +-
crispy_forms/templates/bootstrap3/uni_form.html | 13 +-
.../templates/bootstrap3/whole_uni_form.html | 9 +-
crispy_forms/templates/uni_form/display_form.html | 1 +
.../templates/uni_form/layout/baseinput.html | 16 +-
crispy_forms/templates/uni_form/layout/div.html | 2 +-
crispy_forms/templates/uni_form/multifield.html | 2 +-
crispy_forms/templates/uni_form/uni_form.html | 1 +
crispy_forms/templatetags/crispy_forms_field.py | 40 +-
crispy_forms/templatetags/crispy_forms_filters.py | 13 +-
crispy_forms/templatetags/crispy_forms_tags.py | 72 +-
crispy_forms/templatetags/crispy_forms_utils.py | 47 +-
crispy_forms/tests/__init__.py | 5 -
crispy_forms/tests/base.py | 35 -
crispy_forms/tests/compatibility.py | 9 +
crispy_forms/tests/conftest.py | 42 +
crispy_forms/tests/forms.py | 33 +-
crispy_forms/tests/runtests.py | 15 -
crispy_forms/tests/runtests_bootstrap.py | 32 -
crispy_forms/tests/runtests_bootstrap3.py | 33 -
crispy_forms/tests/runtests_uniform.py | 29 -
crispy_forms/tests/test_dynamic_api.py | 1017 +++++++++----------
crispy_forms/tests/test_form_helper.py | 1023 ++++++++++---------
crispy_forms/tests/test_layout.py | 1025 ++++++++++----------
crispy_forms/tests/test_layout_objects.py | 411 ++++----
crispy_forms/tests/test_settings.py | 22 +-
crispy_forms/tests/test_tags.py | 231 ++---
crispy_forms/tests/urls.py | 12 +-
crispy_forms/tests/utils.py | 68 --
crispy_forms/utils.py | 63 +-
debian/.git-dpm | 6 +-
.../patches/001_fix_django1_6_incompatbility.patch | 27 -
debian/patches/no-remote-resources.patch | 2 +-
debian/patches/series | 1 -
docs/.DS_Store | Bin 6148 -> 0 bytes
docs/contributing.rst | 5 +-
docs/crispy_tag_forms.rst | 34 +-
docs/crispy_tag_formsets.rst | 10 +-
docs/dynamic_layouts.rst | 10 +-
docs/faq.rst | 6 +-
docs/form_helper.rst | 15 +-
docs/index.rst | 1 +
docs/install.rst | 6 +-
docs/template_packs.rst | 70 ++
requirements.txt | 8 +-
setup.py | 24 +-
tox.ini | 14 +
86 files changed, 2896 insertions(+), 2654 deletions(-)
diff --cc debian/.git-dpm
index 4fcdd50,0000000..6be8d36
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
- d052408c9778d0c10d14871824f47e5a25e3b488
- d052408c9778d0c10d14871824f47e5a25e3b488
- 130880f6f736b2628a175271077c93a7b6ed358b
++d4597ac2b690507c54a24dfbf7366082d12356a0
++d4597ac2b690507c54a24dfbf7366082d12356a0
++344c07764ac3ae019953240edfdc5045a4af1dc9
+344c07764ac3ae019953240edfdc5045a4af1dc9
+python-django-crispy-forms_1.5.2.orig.tar.gz
+285478cb9d3035efe9d7a3ff14116c63e32e24f0
+149580
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/no-remote-resources.patch
index 5120aa4,0000000..abd49e7
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 d052408c9778d0c10d14871824f47e5a25e3b488 Mon Sep 17 00:00:00 2001
++From d4597ac2b690507c54a24dfbf7366082d12356a0 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
+--- 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>
+- <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>.
diff --cc debian/patches/series
index 8dee613,0000000..3d3cfb0
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- 001_fix_django1_6_incompatbility.patch
+no-remote-resources.patch
--
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