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

1922 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christopher Neugebauer
d05a41d4f6 Merge branch 'chrisjrn/describe_discount_items' 
Fixes #43.
 2016-08-24 11:46:38 +10:00
Christopher Neugebauer
0b7396c40f Discount line items now describe the product that the discount applies to. 2016-08-24 11:46:15 +10:00
Christopher Neugebauer
1b40472835 Merge branch 'chrisjrn/long_and_thin' 
Fixes #26
 2016-08-22 15:03:32 +10:00
Christopher Neugebauer
482fe22d89 Better reporting of errors in long-and-thin categories 2016-08-22 15:03:08 +10:00
Christopher Neugebauer
d52fc6eb9d Adds a formset for dealing with long-and-thin product categories. 2016-08-22 15:00:45 +10:00
Christopher Neugebauer
02e415c104 Adds an implementation for item-quantity forms. 2016-08-22 15:00:38 +10:00
Christopher Neugebauer
d9f9af9827 Modifies the Category model to allow for ITEM_QUANTITY forms 2016-08-22 15:00:38 +10:00
Christopher Neugebauer
c4274817a8 Moves ProductsForm to the top of its file 2016-08-22 10:15:01 +10:00
Christopher Neugebauer
8c34c7498a Factors _ProductsForm into _HasProductsFields 2016-08-22 10:13:02 +10:00
Christopher Neugebauer
64e897919e Merge branch 'chrisjrn/email_invoices' 2016-08-22 09:28:44 +10:00
Christopher Neugebauer
4f16e4b9d0 Oops. 2016-08-21 18:28:16 +10:00
Christopher Neugebauer
7bf372f92a Invoices now send e-mails when created, paid, or refunded. 2016-08-21 17:14:19 +10:00
Christopher Neugebauer
924906d38c Adds test for e-mails being sent when invoices are generated. 2016-08-21 16:56:15 +10:00
Christopher Neugebauer
e946af0f04 Adds functions for mailing invoices when certain events occur. 2016-08-21 16:56:05 +10:00
Christopher Neugebauer
155f6d42d9 Renames patch_datetime to patches, adds e-mail patching bits 2016-08-21 16:39:57 +10:00
Christopher Neugebauer
1faa608425 Adds email framework shamelessly stolen from Symposion 2016-08-21 15:40:05 +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
59ff38f78b Adds a floatformat to the average 2016-08-16 09:50:17 +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
09725bede0 Modifications to review_admin.html (#62) 
* Modifications to review_admin.html

* Adds “submit & jump to random proposal” button

* If user has a speaker profile, display their speaker profile name alongside their comments instead of their user name.
 2016-08-15 14:04:55 +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
Christopher Neugebauer
e46c4c4b23 Merge pull request #60 from faulteh/master 
Renders comment markdown and adds a gap between vote and username in …
 2016-08-09 17:28:31 +10:00
Scott Bragg
116f8b55e3 Renders comment markdown and adds a gap between vote and username in review comment 2016-08-09 11:23:57 +10:00
Christopher Neugebauer
504cf77574 Allows us to manage additional speakers from the admin (#58) 
* Allows us to manage additional speakers from the admin

* Show speaker e-mail addresses. Fixes #57

* Denotes fields as required.
 2016-08-04 09:59:50 +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