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
..
tests	flake8 fixes	2014-09-27 12:29:00 -05:00
__init__.py	added schedule models (not fully complete)	2012-08-29 19:53:15 -06:00
admin.py	add some columns to schedule admin lists	2012-11-25 15:10:30 -05:00
forms.py	flake8 fixes for the schedule edit form. imports were missing. added a TODO for the atomic call, which is not supported in django 1.4	2014-09-27 12:10:24 -05:00
helpers.py	added create_slot schedule helper	2013-02-21 11:32:12 -07:00
models.py	Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility	2014-12-15 15:15:46 -06:00
timetable.py	Fix flake8 warnings	2014-07-30 15:19:26 -03:00
urls.py	Merge branch 'master' of https://github.com/KyivPy/symposion into KyivPy-master	2014-12-15 15:26:57 -06:00
views.py	adds placeholder values for future model changes to ProposalBase"	2014-09-28 12:52:41 -05:00