Patrick Altman
|
2f89311d42
|
Merge branch 'master' of https://github.com/KyivPy/symposion into KyivPy-master
Conflicts:
symposion/cms/urls.py
symposion/proposals/urls.py
symposion/proposals/views.py
symposion/reviews/urls.py
symposion/schedule/urls.py
symposion/sponsorship/urls.py
|
2014-12-15 15:26:57 -06:00 |
|
Patrick Altman
|
cb4b0fac38
|
Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility
Conflicts:
symposion/boxes/urls.py
symposion/cms/urls.py
symposion/conference/urls.py
symposion/proposals/models.py
symposion/proposals/urls.py
symposion/reviews/urls.py
symposion/schedule/models.py
symposion/schedule/urls.py
symposion/speakers/urls.py
symposion/sponsorship/urls.py
symposion/teams/urls.py
|
2014-12-15 15:15:46 -06:00 |
|
Carlos Henrique Romano
|
36ab6d599f
|
Fix flake8 warnings
|
2014-07-30 15:19:26 -03:00 |
|
Volodymyr Hotsyk
|
7596729ec1
|
Update to Django=1.6
|
2014-07-05 16:11:43 +03:00 |
|
Martin Brochhaus
|
5c07d3e945
|
Django 1.6 compatibility
|
2014-01-11 14:50:04 +08:00 |
|
Luke Hatcher
|
1b57961061
|
orderings on schedules
|
2013-01-29 03:14:56 -05:00 |
|
James Tauber
|
347617ead3
|
added user list and ability for staff to create speaker profiles
|
2012-10-12 00:48:48 -04:00 |
|
Luke Hatcher
|
76c4a7b79c
|
update conferences app
|
2012-07-12 00:38:01 -04:00 |
|
James Tauber
|
4b87c51251
|
updated imports to reflect new layout
|
2012-05-29 15:12:03 -04:00 |
|
James Tauber
|
09aa60777f
|
updated project layout for 1.4 (without content changes)
|
2012-05-29 14:53:04 -04:00 |
|