Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1765 commits 2 branches 0 tags 57 MiB
Commit graph

1765 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Hatcher
962dc1eb23 update debug toolbar 2012-07-10 18:20:49 -04:00
Luke Hatcher
bc4ae3b099 update theme and dua 2012-07-10 18:19:42 -04:00
Luke Hatcher
2665fd5758 update cms/boxes to pycon parity 2012-07-10 18:18:48 -04:00
Luke Hatcher
1b04b7a9f7 update debug toolbar 2012-07-10 18:14:49 -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
c1b7550ed8 added BSD license 2012-06-05 15:13:29 -04:00
James Tauber
8dac027fff Update master 2012-06-04 18:17:38 -03:00
James Tauber
83fae25b60 Merge pull request #9 from pinax/dua 
upgrade to latest Django, Pinax and django-user-accounts
 2012-06-04 14:13:48 -07:00
James Tauber
1191608a8a use django-forms-bootstrap 2012-05-29 21:50:46 -04:00
James Tauber
44fb5325f1 fixed account links on homepage 2012-05-29 15:34:14 -04:00
James Tauber
9477c92abf fixed staticfiles settings 2012-05-29 15:30:35 -04:00
James Tauber
6160ede722 removed homepage use of ifsetting_tag 2012-05-29 15:17:08 -04:00
James Tauber
02319e51c8 updated urls 2012-05-29 15:16:41 -04:00
James Tauber
303877add6 updated templates 2012-05-29 15:12:22 -04:00
James Tauber
4b87c51251 updated imports to reflect new layout 2012-05-29 15:12:03 -04:00
James Tauber
c9e600e42c updated imports to reflect new layout 2012-05-29 15:08:05 -04:00
James Tauber
fc69aa85e8 updated settings 2012-05-29 15:06:24 -04:00
James Tauber
e3c79c056c updated manage.py 2012-05-29 15:00:42 -04:00
James Tauber
e96fe0bd5e updated requirements to 1.4 / DUA and latest versions 2012-05-29 15:00:14 -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
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