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
a6405ccfc7
Fix team permissions backend not pulling out manager_permissions
...
Something like
request.user.has_perm('reviews.can_manage_%s' % proposal.kind.section.slug)
Will aways return false as the backend does a lookup of team membership
(member or manager) but only grabs the 'permissions' and not the
'manager_permissions' field
2016-06-13 21:21:21 +10:00
Patrick Altman
7b77b9aa29
Drop deprecated url patterns format
2016-02-27 16:54:42 -06:00
Patrick Altman
1ab7a30435
Update for BI changes in django-reversion
2016-02-27 16:38:27 -06: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
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
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
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
Brian Rosner
aad54984c5
avoid the extra SELECT
2012-09-15 17:47:59 -06:00
Brian Rosner
bb2ffd2df0
fixed team membership views to work non-POST
2012-09-15 17:32:43 -06:00
Brian Rosner
cee36ad983
modified copy for invite form on team to read more clearly
2012-08-22 15:56:22 -06:00
Luke Hatcher
7f0c8496c7
fix email bug with teams
2012-08-14 17:22:54 -04:00
James Tauber
0dbcbea100
added manager permissions
2012-08-07 23:28:15 -04:00
James Tauber
fad06ab1c1
staff can't apply unless it's by application
2012-08-03 01:24:43 -04:00
James Tauber
5fed9fef17
added basic contrib.messages to teams
2012-08-03 01:11:33 -04:00
James Tauber
16630a6db3
don't show team under available if you have an invitation
2012-08-03 00:56:52 -04:00
James Tauber
da9db62b9a
invitees can now accept an invitation
2012-08-03 00:33:28 -04:00
James Tauber
4272c8f8a8
implemented invitations
2012-08-03 00:21:22 -04:00
James Tauber
7fe481ee98
implemented team accept/reject
2012-08-02 19:09:44 -04:00
James Tauber
2c69596ec6
implemented promote to / demote from manager
2012-08-02 13:17:16 -04:00
James Tauber
7db401e9a2
show members and applicants on team detail page
2012-08-02 13:03:16 -04:00
James Tauber
e96e416bdc
fixed polarity problem in is_staff check
2012-08-02 10:46:37 -04:00
James Tauber
7de1763de0
team permission checks now let staff in
2012-08-02 10:27:34 -04:00
James Tauber
eb2382d3ac
staff can now see all teams on dashboard
2012-08-02 10:17:01 -04:00
James Tauber
9a23c142e8
tweaked available teams tag to avoid overlap
2012-08-01 23:02:53 -04:00
James Tauber
1bfd0cc2f0
implemented team apply
2012-08-01 22:59:41 -04:00
James Tauber
a4dea58195
implemented join/leave teams
2012-08-01 22:49:27 -04:00
James Tauber
4f888ffd57
include state in team detail context vars
2012-08-01 22:28:57 -04:00
James Tauber
3998fe3369
properly link to and control access to team detail page
2012-08-01 21:59:23 -04:00
James Tauber
40f4d1bb8d
display available teams on dashboard and remove debugging print
2012-08-01 21:49:54 -04:00
James Tauber
6e67b50501
added available teams template tag
2012-08-01 21:39:00 -04:00
Luke Hatcher
5dfd74c360
permissions backend based on team membership
2012-07-31 15:24:26 -04:00
James Tauber
86a346f628
view and url from team detail page
2012-07-28 18:30:00 -04:00
James Tauber
a907b78bd1
added helper method to determine team membership state for a user
2012-07-28 18:29:19 -04:00
James Tauber
283ac696ef
teams model tweaks and initial dashboard
2012-07-28 18:10:15 -04:00
James Tauber
69d3df83c1
initial team models and admin
2012-07-28 17:05:01 -04:00
