Commit graph

468 commits

Author SHA1 Message Date
Iacopo Spalletti
9f7584c161 Merge pull request #83 from jedie/author_name
Display username if full name not set
2015-02-19 17:50:23 +01:00
JensDiemer
85bb1eeb7b Display username if full name not set 2015-02-19 14:03:08 +01:00
Iacopo Spalletti
c0d27d08ea Merge pull request #80 from nephila/feature/fix_wheel
Fix conditional dependencies when using wheels
2015-02-19 11:18:36 +01:00
Iacopo Spalletti
3b21c84141 Fix tox.ini 2015-02-19 10:46:17 +01:00
Iacopo Spalletti
c106b101b1 Use stable version of djangocms-helper 2015-02-19 10:46:11 +01:00
Iacopo Spalletti
8dfdcfa0f1 Use environment metadata for conditional dependencies 2015-02-19 10:30:12 +01:00
Iacopo Spalletti
7900d2102e Add information regarding django CMS / filer MIGRATIONS_MODULES 2015-02-10 06:58:40 +01:00
Iacopo Spalletti
4e26bcc2d1 Merge branch 'develop' of github.com:nephila/djangocms-blog into develop 2015-02-08 22:46:57 +01:00
Iacopo Spalletti
bfaa012627 Update badges 2015-02-08 22:46:28 +01:00
Iacopo Spalletti
d95f78facb Merge pull request #74 from motleytech/patch-1
Update README.rst
2015-02-08 09:38:39 +01:00
MotleyTech
1c012e7e2d Update README.rst
Removed a typo.

"sele select" -> "select"
2015-02-07 21:21:03 -08:00
Iacopo Spalletti
0503706bf1 Fix test matrix 2015-02-01 14:43:42 +01:00
Iacopo Spalletti
acefa5fbb9 Merge pull request #72 from creimers/develop
use full_image_options in post_detail.html template
2015-01-26 10:04:28 +01:00
Christoph Reimers
a061c14b6a use full_image_options in post_detail.html template 2015-01-12 23:31:26 +01:00
Iacopo Spalletti
ac237c8813 Bump development version 2015-01-08 15:32:16 +01:00
Iacopo Spalletti
31faae2f20 Bump version 2015-01-08 15:31:00 +01:00
Iacopo Spalletti
178b3c4fda Update history 2015-01-08 15:30:51 +01:00
Iacopo Spalletti
3391fac71a Merge pull request #71 from nephila/feature/fix_cascade
Set post image and thumbnail delete options to set null
2015-01-08 15:29:05 +01:00
Iacopo Spalletti
eabb548bd2 Set post image and thumbnail delete options to set null 2015-01-08 15:03:41 +01:00
Iacopo Spalletti
45051534f0 Merge pull request #70 from nephila/feature/fix_template
Fix page kwarg name in template
2015-01-08 11:33:39 +01:00
Iacopo Spalletti
67a3126b36 Fix page kwarg name in template 2015-01-08 11:18:30 +01:00
Iacopo Spalletti
1ca3f85698 Bump development version 2015-01-04 18:51:33 +01:00
Iacopo Spalletti
280a7c512a Bump version 2015-01-04 18:50:05 +01:00
Iacopo Spalletti
6583fba153 Fix coverage error in travis 2015-01-04 18:39:38 +01:00
Iacopo Spalletti
42c6af5ddf Merge pull request #66 from nephila/test_runs
Refactor travis configuration
2015-01-04 18:37:18 +01:00
Iacopo Spalletti
9b3ab6d1e8 Parametrise a test 2015-01-04 18:27:45 +01:00
Iacopo Spalletti
aae7b87207 Use nose runner 2015-01-04 18:17:25 +01:00
Iacopo Spalletti
8c267e7b58 Use latest runner from djangoms-helper 2015-01-04 18:00:11 +01:00
Iacopo Spalletti
1486583ed8 Temporary fix for pip-setuptools / django CMS issues 2015-01-04 16:52:51 +01:00
Iacopo Spalletti
8a6b54e1c9 Refactor test run 2015-01-01 18:51:45 +01:00
Iacopo Spalletti
eaae535896 Merge pull request #64 from nephila/fix/plugins
If using the request to filter posts, plugin cannot be cached
2014-12-28 16:11:37 +01:00
Iacopo Spalletti
43cb802097 If using the request to filter posts, plugin cannot be cached 2014-12-28 16:03:44 +01:00
Iacopo Spalletti
db12b6deb9 Merge pull request #63 from nephila/fix/toolbar
Don't presume the toolbar is there.
2014-12-28 15:42:30 +01:00
Iacopo Spalletti
03f3f6fca2 Don't presume the toolbar is there. Fix #62 2014-12-28 13:52:07 +01:00
Iacopo Spalletti
7175943932 Bump development version 2014-12-11 07:41:37 +01:00
Iacopo Spalletti
b767a792de Update Authors / History 2014-12-11 07:40:06 +01:00
Iacopo Spalletti
567e1d0c0c Merge pull request #60 from skirsdeda/develop
python 3.3 support
2014-12-11 07:37:55 +01:00
Tadas Dailyda
1448d8fd33 add python 3.4 to setup.py classifiers 2014-12-10 19:24:20 +00:00
Tadas Dailyda
edc74b6782 fix ImproperlyConfigured: Placeholder identifier names need to be of type string in initial Django migration 2014-12-10 12:23:45 +00:00
Tadas Dailyda
9254d3dc1c conditional django-select2-py3 instead of django-select2 for python 3 2014-12-10 11:46:04 +00:00
Tadas Dailyda
31939af387 Merge remote-tracking branch 'upstream/develop' into develop 2014-12-10 11:26:19 +00:00
Iacopo Spalletti
003be58ffe Merge pull request #59 from nephila/feature/django_17_deps
Use south 1.0.1 to ease migration pain
2014-12-07 00:54:30 +01:00
Iacopo Spalletti
f5eb1ba187 Add dependency on south 2014-12-05 21:17:55 +01:00
Iacopo Spalletti
4fe6ba7fd5 Update documentation 2014-12-05 21:17:27 +01:00
Iacopo Spalletti
5de03cb159 fully enable Django 1.7 test failures on travis 2014-12-05 21:17:17 +01:00
Iacopo Spalletti
2a341077fc Merge pull request #57 from nephila/django_1.7
Django 1.7 support
2014-12-05 19:02:23 +01:00
Iacopo Spalletti
248270d164 Update documentation 2014-12-05 15:52:37 +01:00
Iacopo Spalletti
37502d73da Move plugin post queryset in the plugin models 2014-12-05 15:40:24 +01:00
Iacopo Spalletti
1cd52bd389 Fix plugins for users status / language 2014-12-05 15:39:40 +01:00
Tadas Dailyda
f7576691b1 change django-select2 to django-select2-py3 for python3 compatibility 2014-12-04 14:32:45 +00:00