Luke Hatcher
|
ae6fd7947e
|
remove mptt driven menu
|
2012-05-22 00:37:06 -04:00 |
|
Luke Hatcher
|
637921628e
|
Merge branch 'fresh-start' into cms-features
* fresh-start:
update theme
fixed coding convention nits
internationalized the sponsor model fields
Makes conference app fields and models localizable
added documentation for conference models
made sponsorship app conference-aware
initial documentation of sponsorship app
added sponsorship template tags and template fragments; improved admin
fixed incorrect module name in import
initial sponsorship app adapted from DjangoCon
Conflicts:
symposion_project/requirements/base.txt
symposion_project/settings.py
|
2012-05-21 20:10:32 -04:00 |
|
James Tauber
|
e614c907da
|
Merge branch 'fresh-start' into sponsorship
|
2012-02-22 17:37:16 -05:00 |
|
James Tauber
|
fe0473a24a
|
fixed coding convention nits
|
2012-02-22 17:37:05 -05:00 |
|
James Tauber
|
de0cf9f163
|
internationalized the sponsor model fields
|
2012-02-22 17:35:21 -05:00 |
|
James Tauber
|
b2f8919843
|
Merge branch 'fresh-start' into sponsorship
|
2012-02-22 17:19:17 -05:00 |
|
Horst Gutmann
|
e305e6b6e4
|
Makes conference app fields and models localizable
|
2012-02-19 19:54:36 +01:00 |
|
James Tauber
|
ef2624698b
|
made sponsorship app conference-aware
|
2012-02-05 22:50:47 -05:00 |
|
Luke Hatcher
|
4ebfc6d2ba
|
Merge branch 'fresh-start' into cms-features
Conflicts:
symposion_project/settings.py
|
2012-02-05 22:37:24 -05:00 |
|
James Tauber
|
78f05157d2
|
Merge branch 'fresh-start' into sponsorship
|
2012-02-05 22:34:52 -05:00 |
|
James Tauber
|
97b6321f9f
|
implemented notion of CONFERENCE_ID setting and current_conference() function
|
2012-02-05 22:34:12 -05:00 |
|
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 |
|
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
|
d0be075c89
|
adding prototype cms app with pages and menu
|
2012-02-05 20:34:49 -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 |
|