Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/AliLozano/Django-parsley
Browse files Browse the repository at this point in the history
…into assignment-tag-for-parsley
  • Loading branch information
kyogesh committed Jun 29, 2016
2 parents 1cac5e9 + 2ffd365 commit b9fc702
Show file tree
Hide file tree
Showing 14 changed files with 633 additions and 1,821 deletions.
26 changes: 11 additions & 15 deletions .travis.yml
@@ -1,16 +1,16 @@
language: python

python:
- 2.6
- 2.7
- 3.2
- 3.3
- 3.4

env:
- DJANGO=Django==1.3.7
- DJANGO=Django==1.4.2
- DJANGO=Django==1.5.5
- DJANGO=https://github.com/django/django/tarball/stable/1.6.x
- DJANGO='Django>=1.3,<1.4'
- DJANGO='Django>=1.4,<1.5'
- DJANGO='Django>=1.5,<1.6'
- DJANGO='Django>=1.6,<1.7'
# - DJANGO='Django>=1.7,<1.8'
# - DJANGO='https://github.com/django/django/tarball/stable/1.8.x'

install:
- pip install --use-mirrors $DJANGO
Expand All @@ -22,11 +22,7 @@ after_success: coveralls

matrix:
exclude:
- python: 3.2
env: DJANGO=Django==1.3.7
- python: 3.3
env: DJANGO=Django==1.3.7
- python: 3.2
env: DJANGO=Django==1.4.2
- python: 3.3
env: DJANGO=Django==1.4.2
- python: 3.4
env: DJANGO='Django>=1.3,<1.4'
- python: 3.4
env: DJANGO='Django>=1.4,<1.5'
8 changes: 8 additions & 0 deletions CHANGELOG.md
@@ -0,0 +1,8 @@
# Django-parsley changelog

## 0.6

- Added checkbox and radio button validation support.
- Updated parsley.js, included with this library, to 2.0.7
- Changed error message attributes to confirm with parsley.js 2.x. More details <a href="https://github.com/agiliq/Django-parsley/issues/56" target="_blank">here</a>.
- Changed RegexField attributes to confirm with parsley.js 2.x. More details <a href="https://github.com/agiliq/Django-parsley/issues/46" target="_blank">here</a>.
16 changes: 11 additions & 5 deletions README.rst
@@ -1,12 +1,12 @@
django-parsley
==============

.. image:: https://pypip.in/d/django-parsley/badge.png
:target: https://crate.io/packages/django-parsley
.. image:: https://img.shields.io/pypi/dm/django-parsley.svg
:target: https://pypi.python.org/pypi/django-parsley
:alt: Downloads

.. image:: https://pypip.in/v/django-parsley/badge.png
:target: https://crate.io/packages/django-parsley
.. image:: https://img.shields.io/pypi/v/django-parsley.svg
:target: https://pypi.python.org/pypi/django-parsley
:alt: Latest Release

.. image:: https://travis-ci.org/agiliq/Django-parsley.png?branch=master
Expand All @@ -28,6 +28,11 @@ the form field attributes. Django-parsley adds these validations to client side,

Parsley plays well with ``crispy-forms`` et all.

Demo
----
`Demo`_ at https://agiliq.com/demo/parsley/


Installation
------------

Expand Down Expand Up @@ -96,7 +101,7 @@ Put this form inside a

.. code-block:: html

<form parsley-validate>
<form data-parsley-validate>
{{ form.as_p }}
</form>

Expand Down Expand Up @@ -156,3 +161,4 @@ For bug reports open a github ticket. Patches gratefully accepted. Need help? `C

.. _parsleyjs: http://parsleyjs.org/
.. _contact us here: http://agiliq.com/contactus
.. _demo: http://agiliq.com/demo/parsley/

0 comments on commit b9fc702

Please sign in to comment.