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

801 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
85d4272080 Merge pull request #7 from faulteh/lca2017 
Only allow managers of the review sections to email the speaker
 2016-06-14 09:39:44 +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
13393ef826 Merge pull request #6 from faulteh/lca2017 
Update css_class methods to use new vote scoring (removed VOTE_ZERO)
 2016-06-13 20:49:07 +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
4717f30803 Merge pull request #5 from faulteh/lca2017 
Replaced +1/+0/-0/-1 voting with +2/+1/-1/-2
 2016-06-12 10:23:07 +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
Patrick Altman
ad8181091a Merge pull request #130 from pydata/unpublished-conference-schedule 
Show unpublished conference schedule to staff.
 2016-03-15 19:48:07 -05: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
Patrick Altman
0a487cb269 Merge pull request #129 from pydata/slot-admin-content 
Display content_override in slot admin list view.
 2016-03-15 08:54:14 -05:00
Anna Ossowski
88fc54994b Update README.rst 2016-03-15 13:22:29 +01:00
Anna Ossowski
f5558d5f0c Update README.rst 2016-03-15 13:21:19 +01: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
Patrick Altman
2717e4c819 Merge pull request #127 from pydata/not-reviewed-error 
Fix queryset used in "Not Reviewed" view.
 2016-03-10 21:07:25 -06: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
efe413a837 Bump requirements 2016-02-27 16:35:06 -06:00
Anna Ossowski
8a744925b9 Update README.rst 2016-02-26 23:34:34 +01:00
Anna Ossowski
90768e786f Update README.rst 2016-02-26 23:33:32 +01:00
Patrick Altman
3b635d9cb7 Merge pull request #120 from appropriatetech/master 
Python3 compatibility
 2016-02-20 17:06:57 -06:00
Patrick Altman
27cb1cf776 Merge pull request #118 from pydata/loosen-django-requirement 
Loosen Django package requirement.
 2016-02-20 17:06:27 -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
Patrick Altman
73a087c801 Merge pull request #123 from pydata/unpublished-schedule 
Don't show unpublished schedule info to non-staff.
 2016-02-20 17:03:26 -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
Anna Ossowski
47b65ac330 Update README.rst 2016-02-01 20:45:16 +01: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
Anna Ossowski
4f59d7a9a1 Update README.rst 2016-01-21 01:16:12 +01: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
Martey Dodoo
5b9f4fb71e Loosen Django package requirement. 
Loosen Django requirement to allow versions greater or equal to 1.8.5,
instead of mandating 1.8.5. This makes it easier to use newer releases
of Django (e.g. the bugfix and security releases 1.8.6 or 1.8.7) with
symposion.
 2015-12-12 15:34:58 -05:00
Anna Ossowski
75f9739c5c Update README.rst 2015-10-27 20:16:28 +01:00
Patrick Altman
f997e0761a Merge pull request #116 from hivernales/fix-sponsorbenefit-str 
Fix SponsorBenefit __str__
 2015-10-26 08:02:57 -05: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
Anna Ossowski
8b4282a48e Update README.rst 2015-10-07 12:17:36 +02: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