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
|
5e4a6e4407
|
Use sha1 instead of sha256 for compatibility
|
2014-12-15 15:29:17 -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 |
|
Patrick Altman
|
819616ce0c
|
Merge pull request #50 from pyohio/pyohio-messages-proposal-submit
User messages on proposal submit page
|
2014-07-31 23:34:54 -05:00 |
|
Carlos Henrique Romano
|
36ab6d599f
|
Fix flake8 warnings
|
2014-07-30 15:19:26 -03:00 |
|
Volodymyr Hotsyk
|
3ad6d4cfef
|
Update sha_constructor to hashlib.sha256
|
2014-07-05 16:21:49 +03:00 |
|
Rebecca Lovewell
|
c5aad692ff
|
Show message when user does not have permission to access proposal submission page
|
2014-03-14 15:02:38 -04:00 |
|
Rebecca Lovewell
|
6de322216d
|
Show message when user does not have permission to access proposal submission page
|
2014-02-25 21:36:32 -05:00 |
|
Rebecca Lovewell
|
dff5c4b1bb
|
Use hashlib rather than django.utils.hashcompat
|
2014-01-15 09:36:49 -05:00 |
|
Martin Brochhaus
|
5c07d3e945
|
Django 1.6 compatibility
|
2014-01-11 14:50:04 +08:00 |
|
Brian Rosner
|
6c1cfd1a53
|
cleaned up code style
|
2013-06-11 11:10:29 -06:00 |
|
Luke Hatcher
|
11502f4804
|
expand emails to all reviewers and commenters
|
2012-08-30 14:10:32 -04:00 |
|
Luke Hatcher
|
6bfd617e99
|
add message to reviewers when proposal is updated
|
2012-08-27 14:12:19 -04:00 |
|
Luke Hatcher
|
69663679cc
|
fix dashboard issue
|
2012-08-14 17:22:54 -04:00 |
|
Luke Hatcher
|
7b4c5cd205
|
add review message form
|
2012-08-14 17:22:54 -04:00 |
|
James Tauber
|
e00b646f20
|
added method for determining if section is open for proposals and redirect away from form if not
|
2012-08-14 17:09:51 -04:00 |
|
Luke Hatcher
|
4be04a3800
|
don't allow adding documents to cancelled proposals
|
2012-07-18 19:22:29 -04:00 |
|
Luke Hatcher
|
07e98036b7
|
handle cases where USE_X_ACCEL_REDIRECT is not defined
|
2012-07-18 19:21:50 -04:00 |
|
Luke Hatcher
|
7596922f4d
|
add proposals app from pycon
|
2012-07-12 00:38:39 -04:00 |
|