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 |
|
Sheila Miguez
|
ee1f4d92a5
|
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 |
|
Patrick Altman
|
3029878925
|
Merge pull request #51 from pyohio/pyohio-schedule-builder
Schedule Builder
|
2014-07-31 23:37:01 -05:00 |
|
Carlos Henrique Romano
|
36ab6d599f
|
Fix flake8 warnings
|
2014-07-30 15:19:26 -03:00 |
|
David Ray
|
650ddd2bcc
|
resolve merge conf
|
2014-03-14 15:14:34 -04:00 |
|
David Ray
|
62289cad36
|
make private methods more robust
|
2014-03-03 13:48:02 -05:00 |
|
David Ray
|
6102c4e5e4
|
adding back in ws
|
2014-03-03 08:38:47 -05:00 |
|
David Ray
|
4d1e9cf78e
|
work on #6, needs tests
|
2014-02-28 10:55:54 -05:00 |
|
Luke Hatcher
|
c582b2b3e2
|
include keynote in presentation slots, release, bump dev version
|
2013-02-01 00:54:04 -05:00 |
|
Luke Hatcher
|
6f172da50a
|
allow scheduling of tutorial types
|
2012-12-20 01:50:26 -05:00 |
|
Brian Rosner
|
c09f887e72
|
added markitup on Slot content override
|
2012-10-26 16:01:01 -06:00 |
|
Brian Rosner
|
19d826ad00
|
added ability to edit non-talk slots
|
2012-10-26 15:32:03 -06:00 |
|
Brian Rosner
|
51c35434f8
|
exclude cancelled presentations from being slotted
|
2012-09-19 19:22:05 -06:00 |
|
Brian Rosner
|
453a443b5f
|
added ordering to presentations
|
2012-09-19 19:18:29 -06:00 |
|
Brian Rosner
|
f98a3f2f9a
|
added ability to remove content from slots
|
2012-09-19 19:18:29 -06:00 |
|
Brian Rosner
|
7c102aefa3
|
fixed a few larger bugs with schedule edit
|
2012-09-13 23:17:54 -06:00 |
|
Brian Rosner
|
4fc3eb4a10
|
removed empty_label=None on SlotEditForm.presentation
|
2012-09-13 14:51:21 -06:00 |
|
Luke Hatcher
|
1871be41e9
|
empty label
|
2012-08-31 02:31:31 -04:00 |
|
James Tauber
|
06ff53e73c
|
remove unused import
|
2012-08-31 01:12:15 -04:00 |
|
Luke Hatcher
|
224b9c8d57
|
remove slot pk from form
|
2012-08-31 01:00:56 -04:00 |
|
Luke Hatcher
|
bea34fa689
|
slots not required
|
2012-08-31 00:57:53 -04:00 |
|
Luke Hatcher
|
6d2cc584cf
|
form for slot scheduling
|
2012-08-30 23:24:08 -04:00 |
|