Skip to content

Commit ebe099e

Browse files
committed
Tag version 2.0
1 parent c223154 commit ebe099e

File tree

5 files changed

+32
-3
lines changed

5 files changed

+32
-3
lines changed

AUTHORS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ Björn Andersson (@gaqzi)
44

55
Contributors (in alphabetical order):
66

7-
* Min-jong Kim (@pistos2)
7+
* Min-jong Kim (@pistos2)
8+
* Tim Schilling (@tim-schilling)

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# v2.0 (2014-11-01)
2+
3+
## features
4+
5+
* Enable autoescaping for filters. This functions the same way as
6+
built-in Django filters work, which are enabled by default. Because
7+
this has the potential to break current installations the major has
8+
been bumped albeit being a small fix.
9+
10+
111
# v1.3 (2014-09-07)
212

313
## features

README.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,24 @@ This app got two main use cases:
2525

2626
.. _gemoji: https://github.com/github/gemoji
2727

28+
Version 2 release
29+
-----------------
30+
31+
Thanks to `Tim Schilling`_ we now have `autoescaping`_ enabled with the
32+
same logic as core Django. Because this might be a breaking change for
33+
users of this app the major version has been bumped. Apart from the
34+
filters adds the standard XSS protection of Django there are no other
35+
changes.
36+
37+
.. _Tim Schilling: https://github.com/tim-schilling
38+
.. _autoescaping: https://docs.djangoproject.com/en/dev/ref/templates/builtins/#std:templatefilter-escape
39+
40+
To get the old behavior of the app wrap the filter like this:
41+
42+
{% autoescape off %}
43+
{{ emoji|emoji_replace }}
44+
{% endautoescape %}
45+
2846
Quick start
2947
-----------
3048

emoji/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from .models import Emoji as emoji_class
22

3-
__version__ = '1.3.0'
3+
__version__ = '2.0.0'
44

55
Emoji = emoji_class()

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
setup(
1010
name='django-emoji',
11-
version='1.3.0',
11+
version='2.0.0',
1212
packages=find_packages(exclude=('test',)),
1313
include_package_data=True,
1414
license='BSD License',

0 commit comments

Comments
 (0)