Skip to content

Commit 83fae25

Browse files
committed
Merge pull request #9 from pinax/dua
upgrade to latest Django, Pinax and django-user-accounts
2 parents 7f8c614 + 1191608 commit 83fae25

39 files changed

+75
-103
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

manage.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env python
2+
import os, sys
3+
4+
if __name__ == "__main__":
5+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "symposion.settings")
6+
7+
from django.core.management import execute_from_command_line
8+
9+
execute_from_command_line(sys.argv)

symposion_project/requirements/base.txt renamed to requirements/base.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,19 @@
77
--extra-index-url=http://dist.pinaxproject.com/alpha/
88
--extra-index-url=http://dist.pinaxproject.com/fresh-start/
99

10-
Django==1.3.1
11-
Pinax
12-
10+
Django==1.4
11+
pinax-theme-bootstrap==2.0.3
12+
metron==0.1 # 0.2.dev3
13+
pinax-utils==1.0b1.dev3
1314
django-debug-toolbar==0.9.1
14-
django-staticfiles==1.1.2
15-
django_compressor==1.0.1
16-
1715
django-mailer==0.2a1
18-
django-email-confirmation==0.2
1916
django-timezones==0.2
2017
pytz==2011n
2118
django-openid==0.3a1
2219
python-openid==2.2.5
23-
metron==0.1
20+
django_compressor==1.2a1
21+
22+
-e git+git://github.com/pinax/pinax-theme-bootstrap-account.git@70c0be0279d61bd2d0f949698f94b8f938918277#egg=pinax-theme-bootstrap-account
23+
-e git+git://github.com/pinax/django-user-accounts.git@3676d2c7ea0e9a5c3f8510ac8e6f8d58175e6b5f#egg=django-user-accounts
2424

25-
pinax-theme-bootstrap==2.0.3
2625
django-forms-bootstrap==2.0.3.post1
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)