Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
762 commits 2 branches 0 tags 57 MiB
Commit graph

496 commits

Author SHA1 Message Date
Christopher Neugebauer
aa56ac00c3 Updates speaker model to include information that LCA typically asks for 2016-06-19 13:19:32 +10:00
Christopher Neugebauer
0ce99678c3 Updates ProposalBase to include information that LCA typically asks for 2016-06-19 12:39:28 +10:00
Scott Bragg
08698e5326 Merge pull request #15 from lca2017/chrisjrn/002-abstain 
Fixes two bugs in abstain voting
 2016-06-18 18:12:19 +10:00
Scott Bragg
ee1c352571 Merge pull request #14 from lca2017/chrisjrn/011-travel-requirements 
Adds extra fields to the speaker profile
 2016-06-18 17:38:08 +10:00
Christopher Neugebauer
d305cd8c13 Requires comments for non-abstain votes only 2016-06-18 17:07:21 +10:00
Christopher Neugebauer
6e133970d9 Removes div-by-zero error if the first vote is an abstention 2016-06-18 17:01:56 +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
Christopher Neugebauer
47a6f212f2 Add display of scores to the review list 2016-06-18 13:13:18 +10:00
Christopher Neugebauer
28592e352c More changes that make abstention work 2016-06-18 13:07:13 +10:00
Christopher Neugebauer
be4404c602 #2 Adds abstain vote type and revises vote score to account for abstention. 2016-06-18 11:40:18 +10:00
Scott Bragg
ce122994cc Changed admin to the 'can_manage' permission and added an is_manager to the page context 2016-06-13 21:32:55 +10: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
Scott Bragg
acc1b1490e Update css_class methods to use new vote scoring (removed VOTE_ZERO) 2016-06-13 20:46:13 +10:00
Scott Bragg
f1f29c6f61 Replaced +1/+0/-0/-1 voting with +2/+1/-1/-2 (fixes lca2017/symposion/#1) 2016-06-10 15:29:09 +10:00
Martey Dodoo
251f9ea280 Show unpublished conference schedule to staff. 
This is an addendum to #123 to allow the `schedule_conference` view to
show unpublished conference schedules to staff members.
 2016-03-15 12:17:46 -04:00
Patrick Altman
d10d313f64 Merge pull request #128 from jefftriplett/speaker-twitter-username 
Adds twitter username to Speaker
 2016-03-15 08:54:58 -05:00
Martey Dodoo
6fb529aad2 Display content_override in slot admin list view. 
Fix typo and use `content_override` field (instead of `content`) for a
Slot's `list_display`.
 2016-03-15 05:47:25 -04: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
Martey Dodoo
78d13a9ffa Fix queryset used in "Not Reviewed" view. 
The `speaker` field on the `Proposal` model corresponds to a `Speaker`,
not a `User`, so the old queryset created a ValueError.
 2016-03-10 20:35:41 -05: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
3b635d9cb7 Merge pull request #120 from appropriatetech/master 
Python3 compatibility
 2016-02-20 17:06:57 -06:00
Patrick Altman
a1cbcdddd5 Add back in parsing the content override into html 2016-02-20 17:06:09 -06:00
Patrick Altman
6e83588f31 Merge pull request #119 from pydata/fix-duplicate-slot-save-method 
Remove duplicate Slot.save method.
 2016-02-20 17:05:29 -06:00
Patrick Altman
6bee00dff7 Merge pull request #122 from pydata/sponsor-listing-text-is-none 
Make sponsor description default empty string.
 2016-02-20 17:04:32 -06:00
Martey Dodoo
6b41b5c477 Don't show unpublished schedule info to non-staff. 
Add checks to schedule_list, schedule_list_csv, and
schedule_presentation_detail views to verify that either schedule is
published or that current user is staff before displaying information.

See c7592bc33e.
 2016-02-20 08:39:12 -05:00
Martey Dodoo
a487f78f7e Make sponsor description default empty string. 
Set sponsor listing text to an empty string instead of None. If a
sponsor doesn't have a benefit named "Sponsor Description", this will
prevent the text "None" from displaying in the Django template.
 2016-01-25 15:17:23 -05:00
Mjumbe Wawatu Ukweli
47c28439d9 Python3 compatibility 
Update the StringIO import in symposion.sponsorship.views
 2016-01-12 20:39:55 -05:00
Martey Dodoo
ddc3553656 Remove duplicate Slot.save method. 
Remove "save" method in Slot model since #107 added another "save"
method. This fixes the automated test failures in Travis CI.
 2015-12-31 12:35:22 -05:00
Patrick Altman
46a10b9e3a Merge pull request #107 from miurahr/gen_str_name_when_save 
slot: generate __unicode__ name when save()
 2015-12-28 10:50:32 -06:00
Patrick Altman
de23056b51 Merge pull request #115 from miurahr/pip8 
fix pip8 warnings
 2015-12-28 10:50:06 -06:00
Didier Raboud
b50a42f243 Fix SponsorBenefit __str__ by using self.benefit.type instead of self.benefit_type 2015-10-26 12:40:22 +01: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
031ee3807e Fix typo 2015-10-16 19:54:11 -05: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
Hiroshi Miura
c040257547 Slot: gen name retrun by __str__() when save() 
This name also used for itemize slots on admin screen

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-10-01 16:57:26 +09:00
Patrick Altman
a3c89ece12 Use pinax-pages instead 2015-09-13 21:43:02 -05:00
Patrick Altman
ba0bb84ad7 Use django-boxes instead 2015-09-13 21:40:28 -05:00
Patrick Altman
6dd80f9ddb Fix some flake8 issues 2015-09-13 21:34:40 -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
Patrick Altman
509e275706 Merge branch 'admin_sponsor_benefit' of https://github.com/miurahr/symposion into miurahr-admin_sponsor_benefit 
Conflicts:
	symposion/sponsorship/admin.py
	symposion/sponsorship/models.py
 2015-09-08 15:03:06 -05:00
Patrick Altman
ff07405ff0 Merge pull request #114 from uranusjr/timezone-field 
Replace django-timezones w/ django-timezone-field
 2015-09-08 14:56:38 -05:00
Patrick Altman
ffd428d497 Merge pull request #100 from miurahr/python3_compatibility 
python3 compatibility
 2015-09-08 14:55:49 -05:00
Patrick Altman
8a95b0861c Merge branch 'master' into schedule-admin 
Conflicts:
	symposion/schedule/admin.py
 2015-09-08 14:51:49 -05:00
Tzu-ping Chung
1b51ef2ad8 Replace django-timezones w/ django-timezone-field 
django-timezones does not support Python 3. django-timezone-field is
a revived fork that does.

For some unknown reason django-timezone-field's TimeZoneField does
not like positional arguments, so I changed to first argument to a
kwarg "verbose_name".
 2015-08-04 13:47:35 +08: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
f7caf14357 Merge pull request #85 from miurahr/export_sponsor_zip 
Enhanced sponsorship: export files
 2015-08-03 08:01:44 -05:00