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

2062 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Christopher Neugebauer
a160e2b7c3 Fixes messages (#11) 2016-06-18 18:00:08 +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
d7d36e2c05 Merge pull request #8 from lca2017/chrisjrn/006-display-scores 
Adds score display to the review list
 2016-06-18 00:09:18 -07: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
Scott Bragg
a22b4bc2f8 Merge pull request #13 from lca2017/chrisjrn/002-abstain 
Adds abstensions to the vote model
 2016-06-18 14:38:35 +10:00
Scott Bragg
2c9527bfa5 If there are form errors it will now switch to the appropriate tab 2016-06-18 14:27:47 +10:00
Christopher Neugebauer
217f2f32c1 Adds extra fields to the speaker profile model 2016-06-18 13:53:02 +10:00
Christopher Neugebauer
149fbb4ac6 Adds .DS_Store to .gitignore 2016-06-18 13:33:06 +10:00
Christopher Neugebauer
cad0d00817 Adds score display to the review list 2016-06-18 13:13:31 +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
Scott Bragg
2ab4cf10b8 Disables registrasion app for production deployment. (#7) 
* Disable registraison for production environment
Fixes lca2017/symposion#12
 2016-06-18 13:00:56 +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
796e7a6c20 Update template so only managers can post messages to speakers. (#3) 
* Template changes so only papers committee manager can send messages to speaker. lca2017/symposion#3

(also manager can accept/reject/etc)
 2016-06-14 09:40:29 +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
4ef9664620 Change templates to use +2/+1/-1/-2 voting scores (#2) 
* Change review templates to reflect LCA voting scores

* Change review templates to reflect LCA voting scores
 2016-06-13 17:58:55 +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
fbcfd05b02 Merge pull request #1 from faulteh/master 
Changes to get website deployable in production.
 2016-06-11 12:09:06 +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
Scott Bragg
56cad69f8f Git Ignore local_settings so we don't accidentally publish the secret! 2016-06-10 13:47:51 +10:00
Scott Bragg
6b7618cc54 Able to load local_settings for production environment. 2016-06-10 13:38:24 +10:00
Scott Bragg
bfcfb54d1b Update requirements on lca2017 branch so pip doesn't get confused with 
different Django and Symposion versions
 2016-06-10 11:25:46 +10:00
Christopher Neugebauer
1ae9aba44e Merge pull request #55 from parisba/patch-1 
Fixed a typo
 2016-05-12 09:43:31 -07:00
Paris Buttfield-Addison
9056d5d303 Fixed a typo 2016-05-12 11:31:19 -05:00
Christopher Neugebauer
ec882bdbdd Update requirements.txt 
To point at registrasion 0.1.1 (which has a working Wheel file)
 2016-05-10 11:41:44 -07:00
Christopher Neugebauer
2d4f0a4acd Update readme.rst 2016-05-10 11:40:56 -07:00
Christopher Neugebauer
998ae6e6be Points requirements.txt at the lca2017 fork of symposion 2016-05-10 11:00:13 -07:00
Christopher Neugebauer
de83015776 Fixes ordering error in error display 2016-05-02 10:55:29 +10:00
Christopher Neugebauer
ded5114073 Merge branch 'batch_cache' 2016-05-01 19:12:53 +10:00
Christopher Neugebauer
abe8c12b05 Simplifies flag and discount filter functions 2016-05-01 19:12:40 +10:00
Christopher Neugebauer
b9b50c6846 Bug fixes and query optimisations in flag.py and discount.py 2016-05-01 14:56:51 +10:00
Christopher Neugebauer
9ca25e5986 Makes sure that the cache is not disturbed by calling end_batch 2016-05-01 14:56:51 +10:00
Christopher Neugebauer
3ab5ac32ca Part of CartController->BatchController memoisation 2016-05-01 14:56:51 +10:00
Christopher Neugebauer
efb73e7a68 Memoises everything else that needs to be memoised. 2016-05-01 14:56:51 +10:00
Christopher Neugebauer
3d635521eb CartController now uses BatchController memoisation 2016-05-01 14:56:51 +10:00
Christopher Neugebauer
3717adb262 Squash this and last two 2016-05-01 14:56:46 +10:00
Christopher Neugebauer
ad2de6e9d4 Breaks cart batching tests into multiple tests 2016-05-01 14:56:46 +10:00
Christopher Neugebauer
94ceaa3bb1 Adds test case for CartController batching 2016-05-01 14:56:46 +10:00
Christopher Neugebauer
5929c0af3c Adds end_batch functionality 2016-05-01 14:56:45 +10:00
Christopher Neugebauer
3db1256895 Adds test for end_batch functionality 2016-05-01 14:56:45 +10:00
Christopher Neugebauer
a267b60eb9 Makes memoise work properly 2016-05-01 14:56:45 +10:00
Christopher Neugebauer
27ab44ec44 test cases for memoisation 2016-05-01 10:47:15 +10:00