Commit Graph

264 Commits

Author SHA1 Message Date
Michael Elsdörfer 37d458f267 Updated link to django-jinja.
Close #89.
2015-05-25 00:56:59 +02:00
Michael Elsdörfer 17d619248b Fix setup.py, do not require Jinja/Django. 2015-04-21 15:37:18 +02:00
Michael Elsdörfer 60ccdb02c9 Increase version to indicate reborn status. 2015-04-17 15:27:47 +02:00
Michael Elsdörfer 67e3b2d7cf Remove all, except what django-jinja is lacking.
Close #62.
2015-04-17 15:18:29 +02:00
Michael Elsdörfer d89a5313e5 Update version. 2015-01-24 13:36:44 +01:00
Michael Elsdörfer edde1bb81b I guess that's been me for a while now. 2015-01-24 13:36:17 +01:00
Michael Elsdörfer e88acad64c "Merge pull request #73 from erthalion/exception\n\nImproved exception info" 2015-01-24 13:35:35 +01:00
Michael Elsdörfer f753677e6a "Merge pull request #84 from midiotthimble/template-contexts\n\nTemplate.render understands jinja2 contexts now" 2015-01-24 13:32:43 +01:00
Michael Elsdörfer 5aa4eba13b "Merge pull request #85 from dreftymac/patch-1\n\nUpdate README.rst" 2015-01-24 13:28:59 +01:00
Dreftymac bbb33a8021 Update README.rst 2015-01-22 04:47:23 -08:00
Vladislav Polukhin 81dece47d7 Simple stupid bug 2015-01-20 09:31:19 +07:00
Vladislav Polukhin 6cde4de534 Template.render understands jinja2 contexts now 2015-01-19 15:03:54 +07:00
Michael Elsdörfer 7b5d514238 "Merge pull request #78 from Yipit/master\n\nRaise django TemplateDoesNotExist instead of jinja TemplateNotFound" 2014-03-10 12:47:50 +01:00
zmsmith 35217029eb Raise django TemplateDoesNotExist instead of jinja TemplateNotFound 2014-03-05 16:18:11 -05:00
Michael Elsdörfer 373b7b8b2b Merge branch 'master' of https://github.com/coffin/coffin 2014-02-26 21:20:24 +01:00
Michael Elsdörfer 0edbc3e356 Merge pull request #75 from brycedrennan/patch-1
Update docs to match code.
2014-02-26 21:17:53 +01:00
Michael Elsdörfer f165e38dee Merge pull request #75 from brycedrennan/patch-1
Update docs to match code.
2014-02-12 02:15:07 +01:00
Bryce Drennan dfc535b9d8 Update docs to match code. 2014-01-23 20:14:15 -08:00
Michael Elsdörfer 92e9322d2d Merge branch 'feature/get_flatpages' of https://github.com/andreif/coffin 2014-01-06 05:36:33 +01:00
Andrei Fokau 368a39d4fd Remove deprecated mimetype.
See django/django@8eadbc5a for more information.
2013-12-26 18:27:20 +01:00
erthalion 1b2a31b617 Improved exception 2013-12-20 18:05:25 +07:00
Andrei Fokau 87d7c973a1 Remove deprecated xheaders.
See django/django@64e11a68 for more information
2013-11-17 19:16:10 +01:00
Michael Elsdörfer 7bcbacfb37 Merge branch 'master' of https://github.com/nex2hex/coffin 2013-10-04 08:49:07 +02:00
nex2hex 74a579a5f7 Update defaulttags.py
{% url %} support urlconf param
`{% url 'name' urlconf='project.urls.example` %}`
2013-10-02 13:32:52 +06:00
Andrei Fokau 3e8d2bc0c3 Remove remaining reference 2013-09-21 07:21:42 +02:00
Andrei Fokau f13e28ef60 Add get_flatpages to global context. Move it to separate module 2013-09-21 07:12:13 +02:00
Andrei Fokau c0bfe1c056 Enable admin for flatpages 2013-09-20 20:01:24 +02:00
Andrei Fokau 810bd4c959 Add get_flatpages function to flatpage context 2013-09-10 17:01:13 +02:00
Michael Elsdörfer 3f709c69dd Merge pull request #64 from ProstoKSI/truncatewords
Fix truncatewords and truncatewords_html for Django 1.6 support
2013-08-04 17:36:12 +02:00
frol 6cf2899472 Fix truncatewords and truncatewords_html for Django 1.6 support 2013-07-24 21:06:57 -07:00
Michael Elsdörfer 71be0fedf6 Increment version number. 2013-06-28 12:49:02 +02:00
Michael Elsdörfer 0377074b78 Merge pull request #48 from ProstoKSI/datetime
fix date and time filters to origin django's
2013-05-08 22:32:18 +02:00
Michael Elsdörfer 260aa7655b Merge pull request #54 from theatlantic/fix-coffin-generic-imports-django-1.2
Fix imports in coffin.views.generic for Django 1.2 compatibility
2013-05-08 22:29:14 +02:00
Michael Elsdörfer d142ca87db Merge pull request #50 from mrooney/patch-2
Update README.rst for Django 1.5 style {% url %} use
2013-05-08 22:24:51 +02:00
Michael Elsdörfer 331d52fd23 Merge pull request #44 from jokull/master
Moving URL stuff up one level, reflecting Django 1.5 changes
2013-05-08 22:17:10 +02:00
Frankie Dintino ab02bdc3f3 Catch ImportError of Django 1.3+ class-based views for 1.2 compat 2013-03-25 14:39:36 -04:00
Mike Rooney 3bebfb3dee Update README.rst for Django 1.5 style {% url %} use
I spent a while trying to figure out how to get {% url %} to function like {% load url from future %} in Django 1.3/1.4 until I read here about the filter. I think it would be helpful to explicitly mention how to use it with a variable as it took me a bit to figure it out.
2013-03-04 00:05:27 -05:00
Mike Rooney 7e50158dab update README to further explain makemessages use
the README doesn't mention adding coffin to your INSTALLED_APPS anywhere, so I figured perhaps makemessages is the only place that needs it and that it can go here.
2013-02-25 16:03:30 -05:00
frol d9a8906de7 settings import missed 2013-02-21 22:45:05 +02:00
frol ae04afec52 fix date and time filters to origin django's, i.e. |date('DATETIME_FORMAT') works now 2013-02-21 21:52:05 +02:00
Michael Elsdörfer 4ee0963f9f Merge pull request #46 from SpazioDati/master
Fixed a bug in generic views import
2013-01-15 22:28:24 +01:00
Davide Setti 25eb659345 fixed a bug in generic views import 2013-01-07 12:30:05 +01:00
Davide Setti 6c159eb609 Merge branch 'master' of git://github.com/coffin/coffin 2013-01-07 12:21:20 +01:00
Michael Elsdörfer 6753913790 Add support for static tags / staticfiles app. 2013-01-02 22:21:02 +01:00
Michael Elsdörfer d75943cb42 Refactor extension loading slightly. 2013-01-02 22:21:02 +01:00
Jökull Sólberg Auðunsson 8806932095 Moving URL stuff up one level, reflecting Django 1.5 changes 2012-11-29 09:19:05 +00:00
Michael Elsdörfer df814b1b93 Merge pull request #42 from midiotthimble/master
Multiple values support for JINJA2_DEFAULT_TEMPLATE_EXTENSION
2012-11-14 01:01:30 +01:00
Vladislav Poluhin ca6644c81b JINJA2_DEFAULT_TEMPLATE_EXTENSION now supports multiple values 2012-11-13 10:31:24 +08:00
Michael Elsdörfer 8c62cc2260 Merge pull request #41 from midiotthimble/master
closes #40 -- fix jinja_loader_from_django_loader
2012-11-02 15:39:51 +01:00
Vladislav Poluhin 43bc309608 closes #40 -- fix jinja_loader_from_django_loader 2012-11-02 15:27:02 +08:00