Commit graph

67 commits

Author SHA1 Message Date
Luke Hatcher
5b9cb12059 hook up django reversion 2012-02-05 22:30:14 -05:00
James Tauber
9e78e1ace3 Merge branch 'fresh-start' into sponsorship
Conflicts:
	symposion_project/settings.py
2012-02-05 22:04:54 -05:00
Luke Hatcher
99aea4856d Merge branch 'fresh-start' into cms-features 2012-02-05 22:02:32 -05:00
Luke Hatcher
4ca2118bca adding menu context processor and hooking up template 2012-02-05 22:01:56 -05:00
James Tauber
37e6d51792 initial conference/section models 2012-02-05 21:59:14 -05:00
Luke Hatcher
53fecaafc1 add ordering to menus and pages 2012-02-05 20:50:17 -05:00
Luke Hatcher
74cacbdb5b Merge branch 'fresh-start' into cms-features
Conflicts:
	symposion_project/requirements/base.txt
2012-02-05 20:43:09 -05:00
Luke Hatcher
d0be075c89 adding prototype cms app with pages and menu 2012-02-05 20:34:49 -05:00
James Tauber
3d6a69466b initial documentation of sponsorship app 2012-02-05 18:18:30 -05:00
James Tauber
a2c6810460 Merge branch 'fresh-start' into sponsorship 2012-02-05 17:51:52 -05:00
James Tauber
c4b03049ed added some initial wording to the docs 2012-02-05 17:51:04 -05:00
James Tauber
a3cae9f764 initial sphinx configuration 2012-02-05 17:32:14 -05:00
James Tauber
cfc5db0a08 upgraded bootstrap theme 2012-02-05 17:14:46 -05:00
James Tauber
e4e7b890a2 added sponsorship template tags and template fragments; improved admin 2012-02-05 17:13:06 -05:00
James Tauber
64569bccc7 fixed incorrect module name in import 2012-02-05 15:51:27 -05:00
James Tauber
46e38bc758 initial sponsorship app adapted from DjangoCon 2012-02-05 15:03:30 -05:00
James Tauber
0f6843b08d pinax account project 2012-02-05 13:53:49 -05:00