Skip to content

Commit 471a262

Browse files
committed
adding django 1.7 resources
1 parent b1b74cc commit 471a262

File tree

4 files changed

+51
-12
lines changed

4 files changed

+51
-12
lines changed

all.html

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,6 @@ <h2>Django videos</h2>
243243
<a href="http://ontwik.com/category/django/">Django category</a>.</p>
244244
</li>
245245
<li>
246-
<p><a href="http://pyvideo.org/video/2630/designing-djangos-migrations">Designing Django's Migrations</a>
247-
covers Django 1.7's new migrations from the main programmer Andrew Godwin.</p>
248-
</li>
249-
<li>
250246
<p><a href="http://gettingstartedwithdjango.com/">Getting Started with Django</a> is a
251247
series of video tutorials for the framework.</p>
252248
</li>
@@ -260,6 +256,24 @@ <h2>Django videos</h2>
260256
all available free of charge.</p>
261257
</li>
262258
</ul>
259+
<h2>Django 1.7-specific resources</h2>
260+
<ul>
261+
<li>
262+
<p>Paul Hallett wrote a
263+
<a href="https://www.twilio.com/blog/2014/10/upgrading-your-django-reusable-app-to-support-django-1-7.html">detailed Django 1.7 app upgrade guide</a>
264+
on the Twilio blog from his experience working with the django-twilio
265+
package.</p>
266+
</li>
267+
<li>
268+
<p><a href="http://pyvideo.org/video/2630/designing-djangos-migrations">Designing Django's Migrations</a>
269+
covers Django 1.7's new migrations from the main programmer Andrew Godwin.</p>
270+
</li>
271+
<li>
272+
<p>Real Python's <a href="https://realpython.com/blog/python/django-migrations-a-primer/">migrations primer</a>
273+
explores the difference between South's migrations and the built-in
274+
Django 1.7 migrations as well as how you use them.</p>
275+
</li>
276+
</ul>
263277
<h2>Django ORM resources</h2>
264278
<p>The <a href="https://docs.djangoproject.com/en/dev/topics/db/">Django ORM</a> works well
265279
for simple and medium-complexity database operations. However, there are often

django.html

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,6 @@ <h2>Django videos</h2>
155155
<a href="http://ontwik.com/category/django/">Django category</a>.</p>
156156
</li>
157157
<li>
158-
<p><a href="http://pyvideo.org/video/2630/designing-djangos-migrations">Designing Django's Migrations</a>
159-
covers Django 1.7's new migrations from the main programmer Andrew Godwin.</p>
160-
</li>
161-
<li>
162158
<p><a href="http://gettingstartedwithdjango.com/">Getting Started with Django</a> is a
163159
series of video tutorials for the framework.</p>
164160
</li>
@@ -172,6 +168,24 @@ <h2>Django videos</h2>
172168
all available free of charge.</p>
173169
</li>
174170
</ul>
171+
<h2>Django 1.7-specific resources</h2>
172+
<ul>
173+
<li>
174+
<p>Paul Hallett wrote a
175+
<a href="https://www.twilio.com/blog/2014/10/upgrading-your-django-reusable-app-to-support-django-1-7.html">detailed Django 1.7 app upgrade guide</a>
176+
on the Twilio blog from his experience working with the django-twilio
177+
package.</p>
178+
</li>
179+
<li>
180+
<p><a href="http://pyvideo.org/video/2630/designing-djangos-migrations">Designing Django's Migrations</a>
181+
covers Django 1.7's new migrations from the main programmer Andrew Godwin.</p>
182+
</li>
183+
<li>
184+
<p>Real Python's <a href="https://realpython.com/blog/python/django-migrations-a-primer/">migrations primer</a>
185+
explores the difference between South's migrations and the built-in
186+
Django 1.7 migrations as well as how you use them.</p>
187+
</li>
188+
</ul>
175189
<h2>Django ORM resources</h2>
176190
<p>The <a href="https://docs.djangoproject.com/en/dev/topics/db/">Django ORM</a> works well
177191
for simple and medium-complexity database operations. However, there are often

feeds/all.atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-10-01T06:58:22Z</updated></feed>
2+
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-10-01T14:50:36Z</updated></feed>

source/content/pages/02-web-frameworks/0202-django.markdown

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@ syntax and language semantics first before diving into web development.
125125
* Ontwik has learning videos in its
126126
[Django category](http://ontwik.com/category/django/).
127127

128-
* [Designing Django's Migrations](http://pyvideo.org/video/2630/designing-djangos-migrations)
129-
covers Django 1.7's new migrations from the main programmer Andrew Godwin.
130-
131128
* [Getting Started with Django](http://gettingstartedwithdjango.com/) is a
132129
series of video tutorials for the framework.
133130

@@ -140,6 +137,20 @@ syntax and language semantics first before diving into web development.
140137
all available free of charge.
141138

142139

140+
## Django 1.7-specific resources
141+
* Paul Hallett wrote a
142+
[detailed Django 1.7 app upgrade guide](https://www.twilio.com/blog/2014/10/upgrading-your-django-reusable-app-to-support-django-1-7.html)
143+
on the Twilio blog from his experience working with the django-twilio
144+
package.
145+
146+
* [Designing Django's Migrations](http://pyvideo.org/video/2630/designing-djangos-migrations)
147+
covers Django 1.7's new migrations from the main programmer Andrew Godwin.
148+
149+
* Real Python's [migrations primer](https://realpython.com/blog/python/django-migrations-a-primer/)
150+
explores the difference between South's migrations and the built-in
151+
Django 1.7 migrations as well as how you use them.
152+
153+
143154
## Django ORM resources
144155
The [Django ORM](https://docs.djangoproject.com/en/dev/topics/db/) works well
145156
for simple and medium-complexity database operations. However, there are often

0 commit comments

Comments
 (0)