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 |
|
Volodymyr Hotsyk
|
fc4b1c4542
|
Updated urls to 1.6
|
2014-07-05 16:46:01 +03:00 |
|
David Ray
|
64a39b8706
|
resolve merge conflict
|
2014-03-14 15:12:16 -04:00 |
|
David Ray
|
5f27b01452
|
remove unecessary check
|
2014-02-28 12:17:48 -05:00 |
|
David Ray
|
4d1e9cf78e
|
work on #6, needs tests
|
2014-02-28 10:55:54 -05:00 |
|
Rebecca Lovewell
|
76a5e08e2f
|
Use {% load url from future %} in schedule templates
Using https://github.com/futurecolors/django-future-url
|
2014-01-15 09:36:35 -05:00 |
|
Luke Hatcher
|
d93bd38758
|
don't assume category on presentations
|
2013-07-03 16:08:33 -04:00 |
|
Luke Hatcher
|
9c68e4c326
|
use section name instead of section for box slugs
|
2013-01-29 06:11:34 -05:00 |
|
Luke Hatcher
|
adc01c3e0b
|
add schedule specific boxes
|
2013-01-29 06:03:49 -05:00 |
|
Luke Hatcher
|
daf145f987
|
include section name in schedule view
|
2013-01-29 03:14:56 -05:00 |
|
Luke Hatcher
|
8cc9603814
|
add caching to schedule templates
|
2012-12-20 01:52:45 -05:00 |
|
Luke Hatcher
|
c1ff1546fe
|
show all speakers of a presentation
|
2012-12-20 01:51:52 -05:00 |
|
Luke Hatcher
|
2a68242a54
|
add overall conference schedule
|
2012-12-20 01:49:32 -05:00 |
|
Luke Hatcher
|
50fa632127
|
update schedule templates
|
2012-12-19 23:59:48 -05:00 |
|
Luke Hatcher
|
d708b5539e
|
fix rowspan in schedule templates
|
2012-12-14 04:26:28 -05:00 |
|
Brian Rosner
|
0627f5c3ea
|
fixed content_override on public schedule
|
2012-10-26 16:03:50 -06: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
|
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 |
|
James Tauber
|
9e794bd66a
|
implemented speaker profiles
|
2012-10-11 23:55:49 -04:00 |
|
Brian Rosner
|
7c54c8d40b
|
added box to schedule detail
|
2012-09-28 17:36:42 -06:00 |
|
Brian Rosner
|
f4344f4cbb
|
prevent default behavior of anchor when editing slot
|
2012-09-20 20:59:18 -06:00 |
|
James Tauber
|
fad4c7d4dd
|
initial presentation detail page and a couple of other tweaks
|
2012-09-20 22:54:17 -04:00 |
|
James Tauber
|
8dc8f5f34a
|
moved _grid to _edit_grid and implemented read-only grid version
|
2012-09-20 22:02:02 -04:00 |
|
Brian Rosner
|
7db8ab8068
|
reverted debug output
|
2012-09-19 20:55:28 -06:00 |
|
Brian Rosner
|
b7e8e7da8c
|
fixed schedule slot room ordering
|
2012-09-19 20:48:54 -06:00 |
|
James Tauber
|
796a8c98ba
|
show time and location in schedule list
|
2012-09-19 22:19:45 -04:00 |
|
James Tauber
|
c47907b29e
|
pass in schedule to schedule_list and show section name on section list
|
2012-09-19 22:06:22 -04:00 |
|
Brian Rosner
|
1b2cdeffb0
|
fixed URLs and views to use section slug correctly
|
2012-09-19 20:03:30 -06:00 |
|
James Tauber
|
7e81853772
|
improved styling of schedule list
|
2012-09-19 21:17:36 -04:00 |
|
James Tauber
|
4bf5a3c7c4
|
cleaned up styling of schedule edit table including centering room names
|
2012-09-19 21:02:32 -04:00 |
|
James Tauber
|
968e9f4ee6
|
make slot edit just a link on existing presentation title
|
2012-09-19 21:01:40 -04:00 |
|
Brian Rosner
|
7c102aefa3
|
fixed a few larger bugs with schedule edit
|
2012-09-13 23:17:54 -06:00 |
|
Brian Rosner
|
429b47ac09
|
increased slot edit modal height
|
2012-09-13 14:54:11 -06:00 |
|
Luke Hatcher
|
240eb42df4
|
add chosen
|
2012-08-31 02:32:30 -04:00 |
|
James Tauber
|
14870dd5b0
|
removed old facebox reference
|
2012-08-31 01:54:30 -04:00 |
|
Luke Hatcher
|
79e94d6f54
|
fix edit
|
2012-08-31 01:52:45 -04:00 |
|
Luke Hatcher
|
36ceef63ed
|
no animation
|
2012-08-31 01:52:45 -04:00 |
|
Luke Hatcher
|
13bc9ffacb
|
add schedule list
|
2012-08-31 01:52:45 -04:00 |
|
James Tauber
|
9bcfcb62e4
|
improved styling of schedule edit
|
2012-08-31 01:52:04 -04:00 |
|
Luke Hatcher
|
d873283667
|
add class to form button
|
2012-08-31 01:00:43 -04:00 |
|
Luke Hatcher
|
09bce70aed
|
edit schedule templates
|
2012-08-31 00:57:53 -04:00 |
|
James Tauber
|
5c1916352c
|
include class indicating slot kind
|
2012-08-30 22:31:59 -04:00 |
|
James Tauber
|
b4ec8dc29b
|
only show add if the slot is for a talk
|
2012-08-30 22:26:37 -04:00 |
|
James Tauber
|
38e2124c64
|
work in progress improvements to schedule edit styling
|
2012-08-30 12:26:41 -04:00 |
|
James Tauber
|
95d182e528
|
use full span12 on schedule edit
|
2012-08-30 12:17:10 -04:00 |
|
James Tauber
|
746e34cf3c
|
work in progress on schedule edit template
|
2012-08-30 03:14:46 -04:00 |
|