Commit 12ec01ad authored by Chris Routh's avatar Chris Routh 🐰

Merge branch 'fix_docs' into 'master'

Fix documentation oopsie

See merge request open-source/python/django_tidyfields!7
parents 2653f400 82846f9c
......@@ -8,7 +8,7 @@
Welcome to django_tidyfields's documentation!
=================================================
:Version: 1.0.0
:Version: 1.0.1
:Source: https://gitlab.routh.io/open-source/python/django_tidyfields
:Keywords: ``django`` ``lxml`` ``input`` ``html`` ``fields``
:PythonVersion: 3.6+
......@@ -192,7 +192,6 @@ An Additive example
title = TidyCharField()
description = TidyTextField()
body = TidyTextField(field_args=settings.PERMISSIVE_TIDYFIELDS)
<<<<<<< README.rst
History
=======
......@@ -205,8 +204,7 @@ Testing
This module is tested to ensure it does not strip allowed HTML or CSS, but that it does strip XSS attacks or leaves them inert. Nearly 30 attacks from the `OWASP XSS Filter Evasion cheat sheet <https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet>`_ are tested. More will be added in the next version.
Disclaimer: Allowing javascript will compromise the XSS filtering. Do so with utmost caution and only give such priveledges to trusted persons.
=======
>>>>>>> README.rst
.. |build-status| image:: https://gitlab.routh.io/open-source/python/django_tidyfields/badges/master/pipeline.svg
:target: https://gitlab.routh.io/open-source/python/django_tidyfields/commits/master
......
......@@ -5,7 +5,7 @@ import re
from lxml.html.clean import Cleaner
from lxml.html import fromstring, tostring
__version__ = '1.0.0'
__version__ = '1.0.1'
DEFAULT_APP_CONFIG = 'django_tidyfields.apps.DjangoTidyfieldsConfig'
......
......@@ -2,7 +2,7 @@
# see http://setuptools.readthedocs.io/en/latest/setuptools.html#configuring-setup-using-setup-cfg-files
[metadata]
name = django_tidyfields
version = 1.0.0
version = 1.0.1
description = Easily accept html input with Django models, templates and DRF serializers
long_description = file: README.rst
url = https://gitlab.routh.io/open-source/python/django_tidyfields
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment