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 |
|
Carlos Henrique Romano
|
f557337433
|
Increase code complexity in travis configuration
Also mark the view reported as too complex with a FIXME, so we can refactor it
when possible.
|
2014-07-31 08:57:45 -03:00 |
|
Carlos Henrique Romano
|
36ab6d599f
|
Fix flake8 warnings
|
2014-07-30 15:19:26 -03:00 |
|
David Ray
|
5b853f9300
|
Fixes #11
|
2014-06-19 23:55:15 -04:00 |
|
Rebecca Lovewell
|
5e5de6c6ea
|
Pyflakes clean across the entire project
|
2014-01-13 16:49:40 -05:00 |
|
Brian Rosner
|
6c1cfd1a53
|
cleaned up code style
|
2013-06-11 11:10:29 -06:00 |
|
florapdx
|
0ad89365e9
|
added code to review_section view to sort by all, reviewed, and not reviewed
|
2013-04-29 14:02:39 -07:00 |
|
Luke Hatcher
|
14d127a122
|
bulk accept fix
|
2012-12-20 01:50:07 -05:00 |
|
Luke Hatcher
|
cc032da288
|
include user rating in reviews
|
2012-10-03 18:41:35 -04:00 |
|
Brian Rosner
|
bd2fd5338d
|
added DTL handling of email body
|
2012-09-08 19:38:57 -06:00 |
|
Brian Rosner
|
ecfabd5b70
|
added from_address to NotificationTemplate and prepare form
|
2012-09-08 19:10:06 -06:00 |
|
Brian Rosner
|
aafc4e003e
|
protected views from being used by wrong people
|
2012-09-08 17:17:26 -06:00 |
|
Brian Rosner
|
7b25f58087
|
fixed syntax error
|
2012-09-08 17:04:28 -06:00 |
|
Brian Rosner
|
733c4adc53
|
create ResultNotification objects and send mail
|
2012-09-08 17:03:03 -06:00 |
|
Brian Rosner
|
b754bb9add
|
fixed proposal pks and added notification template to send
|
2012-09-08 16:40:00 -06:00 |
|
Brian Rosner
|
1f9ceed0e1
|
added notification template handling in result_notification_prepare
|
2012-09-08 16:35:56 -06:00 |
|
Brian Rosner
|
2b0b986530
|
fixed pk joining
|
2012-09-08 16:30:35 -06:00 |
|
Brian Rosner
|
df0ea0655c
|
implemented more result notification behavior
|
2012-09-08 16:29:17 -06:00 |
|
Brian Rosner
|
1c727a989b
|
added missing NotificationTemplate import
|
2012-09-08 16:14:27 -06:00 |
|
Brian Rosner
|
aa8db3c919
|
added notification_templates to result_notification context
|
2012-09-08 16:13:20 -06:00 |
|
Brian Rosner
|
5fefff0a3d
|
added result_notification_prepare view and stubbed out result_notification_send
|
2012-09-07 18:11:43 -06:00 |
|
James Tauber
|
3dd7468365
|
first pass at models and view for table with selection
|
2012-09-06 22:36:40 -04:00 |
|
James Tauber
|
8f5291b539
|
switched from reserve to standby and added support in UI review detail
|
2012-09-02 15:04:17 -04:00 |
|
James Tauber
|
0422855582
|
switched from using nullboolean accepted on proposal result to a more flexible status choice
|
2012-09-02 14:45:41 -04:00 |
|
Luke Hatcher
|
54991cd4d1
|
only run generator on proposals with a selected status
|
2012-08-25 20:00:13 -04:00 |
|
Luke Hatcher
|
6ee3ff5d45
|
use generator to ensure proposals are filtered by speaker
|
2012-08-25 19:54:17 -04:00 |
|
Luke Hatcher
|
d427ef2941
|
proposal_count is unused
|
2012-08-25 19:52:58 -04:00 |
|
Luke Hatcher
|
1cb22cea95
|
restrict status view to reviewers
|
2012-08-25 19:52:07 -04:00 |
|
Luke Hatcher
|
c7dd6e6f8d
|
add section to review_section context
|
2012-08-14 17:22:54 -04:00 |
|
James Tauber
|
0aca96152f
|
made voting threshold configurable
|
2012-08-14 15:52:23 -04:00 |
|
Luke Hatcher
|
3d68af9796
|
add reviews app
|
2012-08-14 03:54:45 -04:00 |
|