Skip to content
This repository has been archived by the owner on Nov 27, 2019. It is now read-only.

Commit

Permalink
Merge pull request #203 from stefanfoulis/master
Browse files Browse the repository at this point in the history
Merge master back to develop
  • Loading branch information
mkoistinen committed Nov 3, 2015
2 parents b669f85 + 706f327 commit b3853e3
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
11 changes: 11 additions & 0 deletions HISTORY
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
Changelog for django-filer-cmsplugins
=====================================

1.0.0 (2015-11-03)
------------------

* Pin requirements for Django-Filer to >= 1.0.0
* Improve test coverage
* Fix icon_src / remove references of FILER_STATICMEDIA_PREFIX
* XSS fix
* Fix path names for storage backends
* Fix migrations
* Update README


0.10.2 (2015-07-28)
------------------
Expand Down
3 changes: 1 addition & 2 deletions cmsplugin_filer_file/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
__version__ = "0.10.2"
__authors__ = ["Stefan Foulis <stefan.foulis@gmail.com>", ]
__version__ = "1.0.0"
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[wheel]
universal = 1
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
author_email='stefan.foulis@gmail.com',
packages=find_packages(),
classifiers=[
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
'Framework :: Django',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
Expand All @@ -22,11 +22,11 @@
'Topic :: Internet :: WWW/HTTP',
],
install_requires=[
"Django >= 1.4",
"Django >= 1.5",
"django-cms >= 3.0",
"django-sekizai >= 0.4.2",
"easy_thumbnails >= 1.0",
"django-filer >= 0.9",
"django-filer >= 1.0.0",
"django-appconf",
],
include_package_data=True,
Expand Down

0 comments on commit b3853e3

Please sign in to comment.