James Tauber
|
80d2c2d736
|
added proposal models, forms and base fixtures to project
|
2012-07-13 09:21:27 -04:00 |
|
James Tauber
|
9d367667f2
|
got sponsorship app flow working, adding missing templates, etc
|
2012-07-13 08:59:25 -04:00 |
|
Luke Hatcher
|
587112999f
|
use a fake date
|
2012-07-13 03:16:44 -04:00 |
|
Luke Hatcher
|
53a04262d4
|
update dashboard
|
2012-07-13 03:11:22 -04:00 |
|
Luke Hatcher
|
9b0648ddfd
|
add admin link
|
2012-07-13 03:07:54 -04:00 |
|
Luke Hatcher
|
bce0ced774
|
use site name in template
|
2012-07-13 03:07:35 -04:00 |
|
Luke Hatcher
|
343699bc31
|
style edit boxes
|
2012-07-13 03:07:13 -04:00 |
|
Luke Hatcher
|
9ae82e45ef
|
bold labels
|
2012-07-13 00:34:24 -04:00 |
|
Luke Hatcher
|
a5dc78cf71
|
comment out breadcrumbs for now
|
2012-07-13 00:34:16 -04:00 |
|
Luke Hatcher
|
e126be16e3
|
switch speaker forms to vertical form
|
2012-07-13 00:34:07 -04:00 |
|
Luke Hatcher
|
c8e0d667d5
|
update proposal templates to use site_base
|
2012-07-13 00:33:50 -04:00 |
|
Luke Hatcher
|
8d979bf4af
|
add new header
|
2012-07-12 23:38:48 -04:00 |
|
Luke Hatcher
|
907f0a5fd4
|
add sidebar block
|
2012-07-12 23:38:48 -04:00 |
|
Luke Hatcher
|
732c8db23e
|
use symposion sidebar base
|
2012-07-12 23:38:48 -04:00 |
|
Luke Hatcher
|
d4d7acabf4
|
clickable header
|
2012-07-12 23:38:48 -04:00 |
|
Luke Hatcher
|
7c838a526a
|
add sidebar base
|
2012-07-12 23:38:48 -04:00 |
|
Luke Hatcher
|
625f5b1024
|
update front page
|
2012-07-12 23:38:48 -04:00 |
|
Luke Hatcher
|
dc9f313fe6
|
add in less
|
2012-07-12 23:38:48 -04:00 |
|
Luke Hatcher
|
3659da80b9
|
initial dashboard for symposion
|
2012-07-12 16:08:40 -04:00 |
|
Luke Hatcher
|
fcdad2c53b
|
fix speaker templates to use proper base template
|
2012-07-12 16:08:40 -04:00 |
|
Luke Hatcher
|
32c8c0ce50
|
end with a newline
|
2012-07-12 01:59:28 -04:00 |
|
Luke Hatcher
|
21ad87024d
|
add dashboard template
|
2012-07-12 01:32:16 -04:00 |
|
Luke Hatcher
|
3ca56663a4
|
proposals templates
|
2012-07-12 01:31:51 -04:00 |
|
Luke Hatcher
|
0426d8d877
|
speaker templates
|
2012-07-12 01:31:41 -04:00 |
|
Luke Hatcher
|
df1f1dd2f4
|
update urls
|
2012-07-12 01:31:29 -04:00 |
|
Luke Hatcher
|
33ee371975
|
fix package root/project root
|
2012-07-12 01:21:14 -04:00 |
|
Luke Hatcher
|
674a5303ad
|
update urls
|
2012-07-12 01:21:02 -04:00 |
|
Luke Hatcher
|
abc8914cc6
|
modernize wsgi entry point
|
2012-07-12 01:07:31 -04:00 |
|
Luke Hatcher
|
1a8c2d342d
|
add proposals and speakers to installed apps
|
2012-07-12 01:06:12 -04:00 |
|
Luke Hatcher
|
1f59ffa489
|
update project layout
|
2012-07-11 18:51:09 -04:00 |
|
Luke Hatcher
|
3bed4f03c1
|
remove old project dir that seemed to come back with the merge commit
|
2012-07-11 18:40:02 -04:00 |
|
Luke Hatcher
|
b06daba446
|
Merge branch 'master' into cms-features
* master:
added BSD license
Update master
use django-forms-bootstrap
fixed account links on homepage
fixed staticfiles settings
removed homepage use of ifsetting_tag
updated urls
updated templates
updated imports to reflect new layout
updated imports to reflect new layout
updated settings
updated manage.py
updated requirements to 1.4 / DUA and latest versions
updated project layout for 1.4 (without content changes)
Conflicts:
requirements/base.txt
symposion/settings.py
symposion_project/urls.py
|
2012-07-10 15:35:30 -04:00 |
|
James Tauber
|
09aa60777f
|
updated project layout for 1.4 (without content changes)
|
2012-05-29 14:53:04 -04:00 |
|
Luke Hatcher
|
87f14b8015
|
adding in basic nav
|
2012-05-22 02:11:40 -04:00 |
|
Luke Hatcher
|
b65a953ba5
|
get object or 404 on page objects
|
2012-05-22 01:22:32 -04:00 |
|
Luke Hatcher
|
e3252d7120
|
move cms slug down to root url
|
2012-05-22 00:49:32 -04:00 |
|
Luke Hatcher
|
b2b27eec16
|
remove menu
|
2012-05-22 00:49:16 -04:00 |
|
Luke Hatcher
|
1ba6f03529
|
add side nav with sibling pages
|
2012-05-22 00:38:12 -04:00 |
|
Luke Hatcher
|
23503525a6
|
rename block
|
2012-05-22 00:37:53 -04:00 |
|
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
|
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
|
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
|
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 |
|