Patrick Altman
|
f3614fcf52
|
Merge branch 'master' of https://github.com/pyohio/symposion into pyohio-master
Conflicts:
README.md
symposion/boxes/urls.py
symposion/cms/urls.py
symposion/proposals/actions.py
symposion/proposals/urls.py
symposion/proposals/views.py
symposion/reviews/tests.py
symposion/reviews/urls.py
symposion/reviews/views.py
symposion/schedule/forms.py
symposion/schedule/models.py
symposion/schedule/views.py
symposion/speakers/fixture_gen.py
symposion/sponsorship/urls.py
symposion/templates/cms/file_create.html
symposion/templates/cms/file_index.html
symposion/templates/conference/user_list.html
symposion/templates/dashboard.html
symposion/templates/emails/proposal_new_message/message.html
symposion/templates/emails/proposal_updated/message.html
symposion/templates/emails/speaker_addition/message.html
symposion/templates/emails/speaker_invite/message.html
symposion/templates/proposals/_pending_proposal_row.html
symposion/templates/proposals/_proposal_fields.html
symposion/templates/proposals/_proposal_row.html
symposion/templates/proposals/proposal_cancel.html
symposion/templates/proposals/proposal_detail.html
symposion/templates/proposals/proposal_edit.html
symposion/templates/proposals/proposal_speaker_manage.html
symposion/templates/proposals/proposal_submit.html
symposion/templates/reviews/_review_table.html
symposion/templates/reviews/base.html
symposion/templates/reviews/result_notification.html
symposion/templates/reviews/result_notification_prepare.html
symposion/templates/reviews/review_admin.html
symposion/templates/reviews/review_assignment.html
symposion/templates/reviews/review_detail.html
symposion/templates/reviews/review_review.html
symposion/templates/reviews/review_stats.html
symposion/templates/schedule/_edit_grid.html
symposion/templates/schedule/_grid.html
symposion/templates/schedule/_slot_edit.html
symposion/templates/schedule/presentation_detail.html
symposion/templates/schedule/schedule_list.html
symposion/templates/speakers/speaker_create.html
symposion/templates/speakers/speaker_edit.html
symposion/templates/speakers/speaker_profile.html
symposion/templates/sponsorship/add.html
symposion/templates/sponsorship/apply.html
symposion/templates/sponsorship/detail.html
symposion/templates/sponsorship/list.html
symposion/templates/teams/team_detail.html
|
2014-12-15 16:07:37 -06:00 |
|
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 |
|
David Ray
|
f369e1d8ad
|
Merge pull request #4 from pyohio/future-django
Changes for Django 1.5+
|
2014-01-16 05:17:42 -08:00 |
|
David Ray
|
5d4b81ae86
|
Merge pull request #5 from pyohio/update-requirements
Update requirements
|
2014-01-16 05:14:04 -08:00 |
|
David Ray
|
132ce087e5
|
Merge pull request #2 from pyohio/1-south-support
Adding South Support; Work on #1
|
2014-01-15 12:43:22 -08:00 |
|
Rebecca Lovewell
|
e799ead094
|
Remove outdated fixture_gen files
http://github.com/alex/fixture_generator has not been updated since
Django 1.2.
|
2014-01-15 09:58:20 -05:00 |
|
Rebecca Lovewell
|
84bd8f8971
|
Update urls import format
|
2014-01-15 09:35:36 -05:00 |
|
David Ray
|
ef66c7ed12
|
Adding South Support; Work on #1
|
2014-01-14 09:47:49 -05:00 |
|
Rebecca Lovewell
|
5e5de6c6ea
|
Pyflakes clean across the entire project
|
2014-01-13 16:49:40 -05:00 |
|
Martin Brochhaus
|
5c07d3e945
|
Django 1.6 compatibility
|
2014-01-11 14:50:04 +08:00 |
|
florapdx
|
40b04240d4
|
added Meta class ordering by name to order speaker lists and dropdowns
|
2013-04-29 14:00:58 -07:00 |
|
Luke Hatcher
|
c1ff1546fe
|
show all speakers of a presentation
|
2012-12-20 01:51:52 -05:00 |
|
Luke Hatcher
|
4c385bafd5
|
switch to using pk for profile creation
|
2012-10-24 23:59:30 -04:00 |
|
James Tauber
|
347617ead3
|
added user list and ability for staff to create speaker profiles
|
2012-10-12 00:48:48 -04:00 |
|
James Tauber
|
9e794bd66a
|
implemented speaker profiles
|
2012-10-11 23:55:49 -04:00 |
|
James Tauber
|
5944bb5577
|
fix speaker editing so staff can edit rather than rely on group
|
2012-10-11 22:41:45 -04:00 |
|
Luke Hatcher
|
836166f4b3
|
remove extra speaker profile fields
|
2012-07-13 21:43:08 -04:00 |
|
James Tauber
|
81853ece30
|
made biography optional and cleaned up speaker code a little
|
2012-07-12 15:53:44 -04:00 |
|
Luke Hatcher
|
2b7f5546a0
|
add speakers app from pycon
|
2012-07-12 00:38:24 -04:00 |
|