Luke Hatcher
|
b20c348d57
|
add sibling pages to context
|
2012-05-22 00:37:46 -04:00 |
|
Luke Hatcher
|
9d424d91f2
|
add django-mptt to requirements
|
2012-05-22 00:37:15 -04:00 |
|
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 |
|
Luke Hatcher
|
7f8c614fc2
|
update theme
|
2012-05-21 17:17:14 -04:00 |
|
James Tauber
|
d5ea3163da
|
Merge pull request #4 from pinax/sponsorship
Sponsorship
|
2012-03-12 19:46:52 -07: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 |
|
James Tauber
|
05100add88
|
Merge pull request #6 from zerok/conference-i18n
Makes conference app fields and models localizable
|
2012-02-22 14:00:34 -08:00 |
|
Horst Gutmann
|
e305e6b6e4
|
Makes conference app fields and models localizable
|
2012-02-19 19:54:36 +01:00 |
|
James Tauber
|
a88485b46f
|
Merge branch 'fresh-start' into sponsorship
Conflicts:
symposion_project/docs/index.rst
|
2012-02-05 23:07:02 -05:00 |
|
James Tauber
|
d6a73b2c64
|
added documentation for conference models
|
2012-02-05 23:06:16 -05: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 |
|
Luke Hatcher
|
4ca2118bca
|
adding menu context processor and hooking up template
|
2012-02-05 22:01:56 -05:00 |
|
James Tauber
|
5b94e40059
|
added pyc and dev.db to gitignore
|
2012-02-05 21:59:53 -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
|
57e6ccf2ca
|
Merge branch 'initial-docs' into fresh-start
|
2012-02-05 17:51:24 -05:00 |
|
James Tauber
|
c4b03049ed
|
added some initial wording to the docs
|
2012-02-05 17:51:04 -05:00 |
|
James Tauber
|
df720729a0
|
added gitignore with docs _build
|
2012-02-05 17:45:46 -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 |
|
James Tauber
|
086d2d1cc0
|
first commit
|
2012-02-05 13:38:52 -05:00 |
|