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

878 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Bragg
5caedcc09f Merge pull request #53 from lca2017/chrisjrn/better_mailer 
Better send_mail function
 2016-09-18 12:41:33 +10:00
Scott Bragg
50ee66d200 Merge branch 'chrisjrn/better_mailer' of https://github.com/lca2017/symposion into chrisjrn/better_mailer 
Conflicts:
	symposion/utils/mail.py
 2016-09-18 12:40:45 +10:00
Christopher Neugebauer
96683b6d7d Refactors to be a bit less obtuse 2016-09-18 12:37:08 +10:00
Christopher Neugebauer
d54d47487e send_mail is no longer hardwired to point at symposion/emails (who does that?!) 2016-09-18 12:37:08 +10:00
Scott Bragg
433a99a402 All the migrations seem fixed now 2016-09-17 15:53:47 +10:00
Scott Bragg
aa70c5aeb2 Merge pull request #56 from lca2017/chrisjrn/universal_bcc 
Removes BCC amendment to mail.py
 2016-09-07 12:58:11 +10:00
Christopher Neugebauer
6fadca1773 Removes BCC amendment to mail.py 2016-09-07 12:01:34 +10:00
Scott Bragg
3b2beedd4a Merge pull request #54 from faulteh/lca2017 
Remove description, add fields to proposal for notification template
 2016-09-03 15:10:39 +10:00
Scott Bragg
da56226732 Changed var name 2016-09-03 15:06:01 +10:00
Scott Bragg
c7608fb0d5 Added ResultNotification to admin, fixed subject as template 2016-09-03 13:16:05 +10:00
Scott Bragg
420d8ec870 Remove description from Presentation, add fields to proposal for notification template. 2016-09-03 12:48:31 +10:00
Christopher Neugebauer
d9b1583dfe Adds more fields to the reviews CSV 2016-08-25 10:40:21 +10:00
Christopher Neugebauer
b6b6c51cc1 Refactors to be a bit less obtuse 2016-08-21 15:31:09 +10:00
Christopher Neugebauer
565a353375 send_mail is no longer hardwired to point at symposion/emails (who does that?!) 2016-08-21 15:28:22 +10:00
Christopher Neugebauer
efd6ff88f8 "Random selection" change 
Reduces the frequency with which controversial proposals are brought to the front of the review queue.
 2016-08-19 10:29:04 +10:00
Scott Bragg
f3fc572ca7 Merge pull request #48 from lca2017/chrisjrn/20160817 
Review tweaks
 2016-08-17 14:28:32 +10:00
Christopher Neugebauer
d56bcea2e6 Makes the “reviewer’s reviews” page filter by section 2016-08-17 08:09:21 +10:00
Christopher Neugebauer
5735c7745e The “free for all” random reviews should now direct reviewers to under-reviewed proposals more generally. 2016-08-17 07:44:28 +10:00
Christopher Neugebauer
07198b2ecf Direct reviewers to the controversial talks instead of the indifferent talks 2016-08-17 07:35:46 +10:00
Christopher Neugebauer
7b6843ca1e all-reviews CSV now includes the proposal type rather than the proposal section 2016-08-17 07:27:32 +10:00
Christopher Neugebauer
32c2d697b0 PEBACK 3 2016-08-16 09:35:34 +10:00
Christopher Neugebauer
20ad44236b PEBCAK 2 removed 2016-08-16 09:34:04 +10:00
Christopher Neugebauer
faa30b8866 Update views.py 
PEBCAK
 2016-08-16 09:14:50 +10:00
Scott Bragg
5ad2aa0888 Merge branch 'chrisjrn/20160815' into lca2017 2016-08-15 23:03:31 +10:00
Scott Bragg
124335cc7c Merge branch 'lca2017' into chrisjrn/20160815 
Conflicts:
	symposion/reviews/views.py
 2016-08-15 23:02:49 +10:00
Christopher Neugebauer
b9b27abdce sigh 2016-08-15 22:42:54 +10:00
Scott Bragg
5540a30c6e Merge pull request #45 from lca2017/revert-44-chrisjrn/20160815 
Revert "(un-oops)"
 2016-08-15 18:58:04 +10:00
Scott Bragg
3f5ee591b6 Revert "(un-oops)" 2016-08-15 18:56:54 +10:00
Scott Bragg
f937f337ba Merge pull request #44 from lca2017/chrisjrn/20160815 
(un-oops)
 2016-08-15 18:49:39 +10:00
Christopher Neugebauer
cc6db4ed88 Fixes some errors with reviewer averages 2016-08-15 15:35:25 +10:00
Christopher Neugebauer
9c2087c778 Merge remote-tracking branch 'origin/lca2017' into chrisjrn/20160815 2016-08-15 15:34:57 +10:00
Scott Bragg
4f71de1dbf Merge pull request #41 from lca2017/chrisjrn/20160815 
Adds more fields to /review/admin
 2016-08-15 14:10:21 +10:00
Christopher Neugebauer
9223c8fc90 Adds “Submit review and jump to random proposal” button 2016-08-15 12:22:40 +10:00
Christopher Neugebauer
9ae17146df More work on the reviewers list 2016-08-15 11:11:25 +10:00
Christopher Neugebauer
24f8ac8757 Makes the reviewer proposals list render properly 2016-08-15 10:44:44 +10:00
Christopher Neugebauer
3217f43af2 Adds abstains and averages to the reviewers scores list. 2016-08-15 10:41:51 +10:00
Christopher Neugebauer
2a6c192449 Refactors the CSV piece to be nicer than it previously was. 2016-08-15 10:17:27 +10:00
Scott Bragg
9e498544c2 Merge pull request #40 from lca2017/chrisjrn/20160813 
Makes the random proposal button take you to under reviewed proposals.
 2016-08-14 12:02:49 +10:00
Christopher Neugebauer
29fa7c63a9 Makes the random proposal button take you to under reviewed proposals. 
Fixes #38
 2016-08-13 12:19:58 +10:00
Scott Bragg
cc93f124e9 Merge pull request #35 from lca2017/chrisjrn/20160802 
Bugfixes
 2016-08-02 11:23:56 +10:00
Christopher Neugebauer
03a231093f For some reason, our vote label in reviews.py used a unicode en dash. Oops. 
Fixes #34.
 2016-08-02 10:53:53 +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
Scott Bragg
c12a541ec6 Merge pull request #32 from lca2017/chrisjrn/csv_speaker_email 
Adds the speaker's e-mail address to the CSV output
 2016-07-26 08:22:25 +10:00
Christopher Neugebauer
c0f4707032 Adds the speaker's e-mail address to the CSV output 2016-07-25 14:24:25 -07:00
Christopher Neugebauer
0c4597c4ea Update models.py 
Fixes a typo.

Closes issue #31.
 2016-07-22 13:37:24 -07:00
Scott Bragg
c5e9152b4c Merge pull request #29 from lca2017/chrisjrn/27-better-csv 
Handles unicode strings properly.
 2016-07-04 22:22:10 +10:00
Christopher Neugebauer
f126330390 Handles unicode strings properly. 2016-07-04 22:18:34 +10:00
Scott Bragg
9c47421d5a Merge pull request #28 from lca2017/chrisjrn/27-better-csv 
Adds a view that returns all proposals in CSV format.
 2016-07-04 21:26:18 +10:00
Christopher Neugebauer
6ebd0f0905 snoops 2016-07-04 16:28:31 +10:00
Christopher Neugebauer
6811708b33 Adds a view that returns all proposals in CSV format. 
Fixes #27
 2016-07-04 16:10:02 +10:00