Patrick Altman
71e9ca11bd
Namespace the apps
2014-12-18 08:19:01 -06:00
Patrick Altman
b694901831
Remove migrations
...
These migrations were written for South. Now that we have Django 1.7,
we will just use Django migrations once we hit a 1.0 release.
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
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
c17a4cbda1
Merge pull request #49 from pyohio/pyohio-sponsorship-redirect
...
Redirect to dashboard if there are no benefits to edit.
2014-07-31 23:37:34 -05:00
Carlos Henrique Romano
36ab6d599f
Fix flake8 warnings
2014-07-30 15:19:26 -03:00
Volodymyr Hotsyk
7596729ec1
Update to Django=1.6
2014-07-05 16:11:43 +03:00
Rebecca Lovewell
1861ad2926
Redirect to dashboard if there are no benefits to edit.
...
The sponsor object has been created, and we only need to collect details
about the potential-sponsor's benefits. If there are no benefits, the user
should be redirected to the dashboard rather than forced to submit what
appears to be the same form twice.
2014-03-14 14:59:51 -04:00
Rebecca Lovewell
bc3dfd6c4c
Redirect to dashboard if there are no benefits to edit.
...
The sponsor object has been created, and we only need to collect details
about the potential-sponsor's benefits. If there are no benefits, the user
should be redirected to the dashboard rather than forced to submit what
appears to be the same form twice.
2014-02-11 11:26:56 -05:00
David Ray
f369e1d8ad
Merge pull request #4 from pyohio/future-django
...
Changes for Django 1.5+
2014-01-16 05:17:42 -08:00
David Ray
132ce087e5
Merge pull request #2 from pyohio/1-south-support
...
Adding South Support; Work on #1
2014-01-15 12:43:22 -08:00
Rebecca Lovewell
b495eddc61
direct_to_template -> TemplateView
2014-01-15 09:36:15 -05:00
Rebecca Lovewell
84bd8f8971
Update urls import format
2014-01-15 09:35:36 -05:00
David Ray
cca9ad0793
add dependencies for proper migration order
2014-01-14 11:06:41 -05:00
David Ray
ef66c7ed12
Adding South Support; Work on #1
2014-01-14 09:47:49 -05:00
Rebecca Lovewell
5e5de6c6ea
Pyflakes clean across the entire project
2014-01-13 16:49:40 -05:00
Martin Brochhaus
5c07d3e945
Django 1.6 compatibility
2014-01-11 14:50:04 +08:00
James Tauber
7c3d4f2912
Merge pull request #35 from taavi/better-word-limit-error-message
...
Provides a better error message when a sponsor benefit text field is lon...
2013-07-03 16:52:45 -07:00
Brian Rosner
6c1cfd1a53
cleaned up code style
2013-06-11 11:10:29 -06:00
Taavi Burns
0a597d38bf
Provides a better error message when a sponsor benefit text field is longer than the allowed limit.
...
It tells you how many words you've written!
2013-05-17 09:31:55 -04:00
florapdx
9ab34b8ea5
deleted my inline comment
2013-04-24 16:08:31 -07:00
florapdx
8f0e4cf6a1
change behavior so that admin can add sponsor logos/text in-dashboard
2013-04-24 13:47:42 -07:00
James Tauber
72f2c06010
added external URL field to sponsor application form
2012-11-06 13:13:51 -05:00
James Tauber
daff4020ea
redirect to sponsor edit after submission; allow sponsor details to be filled out before approval
2012-10-18 13:24:08 -04:00
James Tauber
0f32fdcb74
allow staff to add sponsors directly via interface
2012-10-18 12:38:03 -04:00
Luke Hatcher
1ad87798ad
add management command to reset sponsor benefits
2012-09-13 17:28:41 -04:00
Luke Hatcher
584392e897
sponsor signals to handle benefits
2012-07-18 19:24:46 -04:00
Luke Hatcher
53e37d6ec0
properties for logo and listing text benefits
2012-07-18 19:23:59 -04:00
Luke Hatcher
02a8e274f7
update admin views for sponsors
2012-07-18 19:22:41 -04:00
Luke Hatcher
022d62721d
fix pycon imports
2012-07-13 21:45:13 -04:00
James Tauber
9d367667f2
got sponsorship app flow working, adding missing templates, etc
2012-07-13 08:59:25 -04:00
James Tauber
3ffcc4da7c
first pass at merging pycon's sponsorship app with more basic symposion one
2012-07-12 15:17:49 -04:00
James Tauber
c9e600e42c
updated imports to reflect new layout
2012-05-29 15:08:05 -04:00
James Tauber
09aa60777f
updated project layout for 1.4 (without content changes)
2012-05-29 14:53:04 -04:00
