Commit graph

47 commits

Author SHA1 Message Date
Sachi King
21b2a01a84 Py2 compatability has been broke elsewhere drop it
This is all noop in Py3, and Py2 is broke now in various places.
Dropping Py2 code as it will not be a thing going forward.

Django 2 is the next release, Py2 support will be dropped, as such,
dropping this is forward looking.
2017-04-29 15:47:19 +10:00
Sachi King
298b162be6 Flake8 Fixes
Mostly whitespace fixes
Some unicode fixes
Fixed up CSV writer.  str is not bytes and all.
2017-04-17 22:51:48 +10:00
Sachi King
d5986de870 Use django's login_required decorator
This only seems to be here to have some custom login_url used bypassing
django's model.  Well as we want to use django's model, this just won't
do.  So lets move to using django's model.
2017-03-26 12:32:32 +11:00
Scott Bragg
dbb4ebbb70 Add a permission to view speaker contact details in conference.json 2016-12-30 19:21:36 +11:00
Christopher Neugebauer
2aa0074bdc Removes speaker assistance options from the profile form. 2016-09-26 11:18:05 +10:00
Scott Bragg
433a99a402 All the migrations seem fixed now 2016-09-17 15:53:47 +10:00
Christopher Neugebauer
5a8b7ecc30 Fixes markdown cheat sheet links in speaker and proposals forms.
Fixes #33.
2016-08-02 10:51:43 +10:00
Christopher Neugebauer
0c4597c4ea Update models.py
Fixes a typo.

Closes issue #31.
2016-07-22 13:37:24 -07:00
Christopher Neugebauer
e17df73dde Update models.py
en-GB spelling of "programme"
2016-07-03 12:14:07 +10:00
Christopher Neugebauer
388c722ed6 Makes sure accessibility requirements are parsed 2016-06-19 14:07:43 +10:00
Christopher Neugebauer
c0e9b90476 Requires acceptance of the code of conduct and T&Cs 2016-06-19 14:00:17 +10:00
Christopher Neugebauer
aa56ac00c3 Updates speaker model to include information that LCA typically asks for 2016-06-19 13:19:32 +10:00
Christopher Neugebauer
b2af1d0c06 oops 2016-06-18 16:51:28 +10:00
Christopher Neugebauer
f64a7573d3 - Adds defaults to the speaker profile
- Removes “experience”, as this is listed in “other notes” on a per-proposal basis.
2016-06-18 16:50:11 +10:00
Christopher Neugebauer
217f2f32c1 Adds extra fields to the speaker profile model 2016-06-18 13:53:02 +10:00
Jeff Triplett
c7ce7fe020 Adds twitter_username to Speaker
This change is based on the PyOhio fork located at: https://github.com/PyCon/pycon/search?utf8=%E2%9C%93&q=twitter_username
2016-03-14 22:24:14 -05:00
Patrick Altman
7b77b9aa29 Drop deprecated url patterns format 2016-02-27 16:54:42 -06:00
Hiroshi Miura
d68e310089 fix pip8 warnings
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-10-17 10:57:18 +09:00
Patrick Altman
11f697d137 Massively upgrade symposion
* Remove markitup (to be replaced with Ace editor)
* Use DUA decorators
* Removed custom signup bits
* Upgraded dependencies
* Added migrations
* Namespaced template locations
* Removed html5parser/sanitizer (for now) - parsing functionality
should be moved out entirely to a hooks
* Replaced ProposalScoreExpression object with a  function that returns
F() expressions
2015-10-16 12:37:35 -05:00
Patrick Altman
67433cacb4 Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all
Conflicts:
	symposion/boxes/models.py
	symposion/conference/models.py
	symposion/schedule/models.py
	symposion/speakers/models.py
	symposion/sponsorship/admin.py
	symposion/sponsorship/models.py
	symposion/teams/models.py
2015-09-08 15:07:24 -05:00
Hiroshi Miura
3207621058 i18n all part
- forms for labels and helps
- views for success or warning messages
- apps and models verbose_names for admin

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-08-03 23:37:33 +09:00
Hiroshi Miura
a95825ede8 python3 compatibility
- Things are suggested in python3 porting guide.
https://docs.djangoproject.com/en/1.8/topics/python3/

     1. adding ```from django.utils.encoding import
     python_2_unicode_compatible```

     2. ``` __str__``` instead of ```__unicode__```
     https://docs.djangoproject.com/en/1.8/topics/python3/#str-and-unicode-methods

     3. Adding ```from __future__ import unicode_literals``` at the top
     of your Python modules
     https://docs.djangoproject.com/en/1.8/topics/python3/#unicode-literals

     4. Removing the `u` prefix before unicode strings;
     https://docs.djangoproject.com/en/1.8/topics/python3/#unicode-literals

- also closed #66

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-08-03 23:32:25 +09:00
Hiroshi Miura
039ce4e000 Return unicode from _unicode_ methods
Import from PyCon improvement.

Author: Dan Poirier <dpoirier@caktusgroup.com>
Date:   Mon Jul 8 15:55:33 2013 -0400

    Return unicode from __unicode__ methods

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-05-25 08:35:55 +09:00
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
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
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
5d4b81ae86 Merge pull request #5 from pyohio/update-requirements
Update requirements
2014-01-16 05:14:04 -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
e799ead094 Remove outdated fixture_gen files
http://github.com/alex/fixture_generator has not been updated since
Django 1.2.
2014-01-15 09:58:20 -05:00
Rebecca Lovewell
84bd8f8971 Update urls import format 2014-01-15 09:35:36 -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
florapdx
40b04240d4 added Meta class ordering by name to order speaker lists and dropdowns 2013-04-29 14:00:58 -07:00
Luke Hatcher
c1ff1546fe show all speakers of a presentation 2012-12-20 01:51:52 -05:00
Luke Hatcher
4c385bafd5 switch to using pk for profile creation 2012-10-24 23:59:30 -04:00
James Tauber
347617ead3 added user list and ability for staff to create speaker profiles 2012-10-12 00:48:48 -04:00
James Tauber
9e794bd66a implemented speaker profiles 2012-10-11 23:55:49 -04:00
James Tauber
5944bb5577 fix speaker editing so staff can edit rather than rely on group 2012-10-11 22:41:45 -04:00
Luke Hatcher
836166f4b3 remove extra speaker profile fields 2012-07-13 21:43:08 -04:00
James Tauber
81853ece30 made biography optional and cleaned up speaker code a little 2012-07-12 15:53:44 -04:00
Luke Hatcher
2b7f5546a0 add speakers app from pycon 2012-07-12 00:38:24 -04:00