Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'hotfix-1.1.1'

  • Loading branch information...
commit 7e73a145c80b45ca223bbbe873606053ff1370ae 2 parents 6298679 + c25d38c
@brosner brosner authored
View
2  pycon_project/requirements/project.txt
@@ -14,7 +14,7 @@ pytz==2010h
django-openid==0.2.3.dev1
python-openid==2.2.5
oauth2==1.1.3
-biblion==0.1.dev6
+biblion==0.1.dev10
creole==1.1
django-atomformat==0.1.1.dev1
Pygments==1.3.1
View
25 pycon_project/templates/biblion/atom_entry.xml
@@ -1,25 +0,0 @@
-<entry xml:base="http://{{ current_site.domain }}/">
- <id>http://{{ current_site.domain }}{{ entry.get_absolute_url }}</id>
- <title>{{ entry.title }}</title>
- <link rel="alternate" type="text/html" href="http://{{ current_site.domain }}{{ entry.get_absolute_url }}"/>
-
- <updated>{{ entry.updated|date:"Y-m-d\TH:i:s\Z" }}</updated>
- <published>{{ entry.published|date:"Y-m-d\TH:i:s\Z" }}</published>
-
- <author>
- <name>{{ entry.author.get_full_name }}</name>
- </author>
-
- <summary type="xhtml">
- <div xmlns="http://www.w3.org/1999/xhtml">
- {{ entry.teaser_html|safe }}
- </div>
- </summary>
-
- <content type="xhtml" xml:lang="en">
- <div xmlns="http://www.w3.org/1999/xhtml">
- {{ entry.teaser_html|safe }}
- {{ entry.content_html|safe }}
- </div>
- </content>
-</entry>
View
16 pycon_project/templates/biblion/atom_feed.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-
- <id>{{ feed_id }}</id>
-
- <title>{{ feed_title }}</title>
-
- <link rel="alternate" type="text/html" href="{{ blog_url }}" />
- <link rel="self" type="application/atom+xml" href="{{ feed_url }}" />
-
- <updated>{{ feed_updated|date:"Y-m-d\TH:i:s\Z" }}</updated>
-
- {% for entry in entries %}
- {% include "biblion/atom_entry.xml" %}
- {% endfor %}
-</feed>
Please sign in to comment.
Something went wrong with that request. Please try again.