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

637 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Tauber
3ffcc4da7c first pass at merging pycon's sponsorship app with more basic symposion one 2012-07-12 15:17:49 -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
d31953b544 bring over forms and views form pycon for now 2012-07-12 01:32:07 -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
db95cb6180 add utils 2012-07-12 01:20:55 -04:00
Luke Hatcher
abc8914cc6 modernize wsgi entry point 2012-07-12 01:07:31 -04:00
Luke Hatcher
1243e2a8ab add django-model-utils to project base 2012-07-12 01:06:25 -04:00
Luke Hatcher
1a8c2d342d add proposals and speakers to installed apps 2012-07-12 01:06:12 -04:00
Luke Hatcher
1759cf569e pycon conference fixture 2012-07-12 00:39:29 -04:00
Luke Hatcher
6d9c1c2e5f temporarily include pycon module containing advanced sponsorship app 2012-07-12 00:39:15 -04:00
Luke Hatcher
7596922f4d add proposals app from pycon 2012-07-12 00:38:39 -04:00
Luke Hatcher
2b7f5546a0 add speakers app from pycon 2012-07-12 00:38:24 -04:00
Luke Hatcher
76c4a7b79c update conferences app 2012-07-12 00:38:01 -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
0430f166fe Merge branch 'cms-features' 
* cms-features:
  update theme and dua
  update cms/boxes to pycon parity
  update debug toolbar
  adding in basic nav
  get object or 404 on page objects
  move cms slug down to root url
  remove menu
  add side nav with sibling pages
  rename block
  add sibling pages to context
  add django-mptt to requirements
  remove mptt driven menu
  hook up django reversion
  adding menu context processor and hooking up template
  add ordering to menus and pages
  adding prototype cms app with pages and menu
 2012-07-11 18:36:52 -04:00
Luke Hatcher
5e7c15d51c update theme and dua 
Conflicts:
	requirements/base.txt
 2012-07-10 18:21:55 -04:00
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