Patrick Altman
5f311ca7bd
Replace dotted notation FKs with actual objects
2014-12-18 08:19:01 -06:00
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
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
Sheila Miguez
0ebcc2f124
flake8 fixes
2014-09-27 12:29:00 -05:00
Taavi Burns
c4db94b7e5
Adds a schedule_json view which provides a /schedule/conference.json endpoint, of the kind that Carl uses for producing conference videos.
...
Also useful to feed into mobile schedule apps!
It is expected that someone might have to customize this for their own installation (PyCon Canada definitely did, with modifications to some of the models).
2014-09-27 12:29:00 -05:00
David Ray
2f6930ae11
Fixes #12 ; 500 error when re/un assigning slot presentations
2014-08-11 16:33:23 -04:00
Carlos Henrique Romano
36ab6d599f
Fix flake8 warnings
2014-07-30 15:19:26 -03:00
Martin Brochhaus
bf4b682e8a
Bugfix: Cannot unassign presentation on schedule/edit view
2014-05-18 15:50:51 +08:00
Rebecca Lovewell
5e5de6c6ea
Pyflakes clean across the entire project
2014-01-13 16:49:40 -05:00
Luke Hatcher
c7592bc33e
add published and hidden attributes to schedules
2013-01-29 03:14:56 -05:00
Luke Hatcher
1b57961061
orderings on schedules
2013-01-29 03:14:56 -05:00
Luke Hatcher
582597b7b8
only yield actual users
2012-12-20 01:55:14 -05:00
Luke Hatcher
d98f9b82a8
add default ordering to schedule models
2012-12-20 01:53:22 -05:00
Luke Hatcher
c1ff1546fe
show all speakers of a presentation
2012-12-20 01:51:52 -05:00
Luke Hatcher
9977393d88
content override is optional
2012-11-25 19:12:36 -05:00
Luke Hatcher
3b46ba3012
provide string representations for schedule models
2012-11-25 13:26:25 -05:00
Brian Rosner
c09f887e72
added markitup on Slot content override
2012-10-26 16:01:01 -06:00
Brian Rosner
d7ac510555
Added Slot.content_override
...
Slots can now be controlled through content_override if custom content is
needed in non-talk slots.
2012-10-24 23:21:20 -06:00
Brian Rosner
f698d00fc8
added Room.__unicode__
2012-09-19 20:17:48 -06:00
Brian Rosner
f30dce6a61
added SLot.rooms property
2012-09-19 20:16:07 -06:00
Brian Rosner
1b2cdeffb0
fixed URLs and views to use section slug correctly
2012-09-19 20:03:30 -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
db66749046
improved Proposal.proposal
...
* renamed the field to avoid nasty underscore
* fixed code to avoid extra query
2012-09-13 14:39:58 -06:00
Luke Hatcher
402a02097f
use proposal number
2012-08-31 03:05:52 -04:00
Luke Hatcher
5b0354be90
add id and speaker to presentation
2012-08-31 02:52:12 -04:00
Luke Hatcher
fe29c708b9
no models in markupfield land
2012-08-30 22:57:58 -04:00
Luke Hatcher
40aede0839
add foreign key to presentation
2012-08-30 22:55:44 -04:00
Luke Hatcher
4ecb2272df
change to onetoone
2012-08-30 22:46:23 -04:00
Luke Hatcher
5b7087f478
add proposal base to presentation
2012-08-30 22:43:43 -04:00
Luke Hatcher
7324d03031
add presentation model
2012-08-30 22:37:01 -04:00
Brian Rosner
2c954c3a05
Fixed slot rooms by using database more natively
2012-08-30 11:52:11 -06:00
Brian Rosner
3ade1c5516
Fixed typo in method name
2012-08-30 01:04:08 -06:00
Brian Rosner
f3e9cc9a5d
Added TimeTable
2012-08-30 00:51:07 -06:00
Brian Rosner
0a4e626dfe
Started detail and edit views with slug field to Schedule
2012-08-30 00:21:48 -06:00
Brian Rosner
77dc781e0d
Improved schedule models and behavior
...
This allows for full slot creation now.
2012-08-29 23:58:03 -06:00
Brian Rosner
143dbbce28
added schedule models (not fully complete)
2012-08-29 19:53:15 -06:00
