Andromeda Yelton
|
60f9bc29da
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-01-12 13:58:03 -05:00 |
|
Andromeda Yelton
|
f80226fe5e
|
minor additions to the press page, plus new users now go to supporter page on login
|
2012-01-12 13:57:50 -05:00 |
Raymond Yee
|
51cc7d4389
|
IMPORTANT: Transactions that are ACTIVE status must also have approved=True to be counted as an effectlvely active Transaction.
Changes in two tests are made to reflect this change.
|
2012-01-11 15:31:26 -08:00 |
Raymond Yee
|
9130aa8b4a
|
The approved flag from IPNs for Preapprovals now captured properly.
|
2012-01-11 22:46:59 +00:00 |
|
Raymond Yee
|
9d7be4849a
|
BUG FIX: must use request.POST.get("approved", 'None') to get approved attribute in IPN
|
2012-01-11 13:58:29 -08:00 |
|
Raymond Yee
|
712b803334
|
PreapprovalDetails now capturing approved flag
partial work on IPN to capture approved flag
|
2012-01-11 13:47:56 -08:00 |
|
Raymond Yee
|
7202e97f19
|
Allow for PaymentManager.checkStatus() to receive specific list of Transaction to process
|
2012-01-11 11:50:08 -08:00 |
|
Raymond Yee
|
25bc05050a
|
Starting to refactor PaymentManager.checkStatus() to be able to handle transactions we pass in....first step is to factor out methods to handle Preapprovals vs Payments
|
2012-01-11 11:12:12 -08:00 |
|
Raymond Yee
|
c5c9951c3d
|
Fixed a bug in PaymentManager.checkStatus() -- I was appending statuses for recipients in the wrong place
|
2012-01-11 10:43:12 -08:00 |
|
Raymond Yee
|
0c7c912200
|
Adding Transaction.approved field (migration needed!)
|
2012-01-11 09:40:51 -08:00 |
|
thatandromeda
|
c054c45f0f
|
press link in footer should actually link to press page, huh
|
2012-01-11 12:12:56 -05:00 |
|
Andromeda Yelton
|
676fca8d5e
|
removed fixed height from learn more definition
|
2012-01-11 12:04:22 -05:00 |
|
Andromeda Yelton
|
5654b5cd5e
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-01-11 10:01:14 -05:00 |
|
Andromeda Yelton
|
b6998daac3
|
now the press page has pretty images. and links get a text decoration on hover, to be more obvious.
|
2012-01-11 10:00:10 -05:00 |
|
Raymond Yee
|
7a16029d72
|
Small bug in the feedback view: user -> request.user
|
2012-01-10 17:21:37 -08:00 |
|
Raymond Yee
|
54f2411ab9
|
Put in a basic page for a pledge completion.
|
2012-01-10 17:15:39 -08:00 |
|
Raymond Yee
|
86ff9ccdee
|
Merge branch 'master' of github.com:Gluejar/regluit into payment
|
2012-01-10 15:27:38 -08:00 |
|
Raymond Yee
|
01f5664bf5
|
Some very basic functionality associated with cancel_url, including the ability to try again on the pledge.
|
2012-01-10 15:26:04 -08:00 |
|
Andromeda Yelton
|
9b6524c6fd
|
fleshing out the press kit
|
2012-01-10 16:27:31 -05:00 |
eric
|
d7e5e6e1ed
|
Merge branch 'master' into generic_id
|
2012-01-10 15:40:15 -05:00 |
|
eric
|
0d19018e62
|
api tests working; non-google id's working
|
2012-01-10 15:20:02 -05:00 |
|
Raymond Yee
|
3abd29f225
|
First pass at passing in campaign id into cancel_url (which is now calculated in payment/manager.py)
|
2012-01-10 12:16:04 -08:00 |
|
Raymond Yee
|
162d521ddd
|
Merge branch 'master' of github.com:Gluejar/regluit into payment
|
2012-01-10 10:27:34 -08:00 |
|
Raymond Yee
|
dbfab2fa14
|
Merge branch 'payment' of github.com:Gluejar/regluit into payment
|
2012-01-10 10:27:01 -08:00 |
|
Andromeda Yelton
|
7ca9a5f0a7
|
it is the skeleton of a press kit
|
2012-01-10 11:10:27 -05:00 |
|
Andromeda Yelton
|
95f32400ec
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-01-09 16:13:49 -05:00 |
|
Andromeda Yelton
|
556ecf8a06
|
now users can give us feedback on alpha
|
2012-01-09 15:53:09 -05:00 |
|
eric
|
0b91017dd5
|
Did what edso told me not to do- re-architected db to use generic ids
|
2012-01-09 13:55:22 -05:00 |
|
Raymond Yee
|
a4957a5bf6
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-01-09 12:47:51 -05:00 |
|
Andromeda Yelton
|
a7009b1998
|
whoops, should probably commit the version that passes tests
|
2012-01-09 12:44:35 -05:00 |
|
Raymond Yee
|
2d1ab0dba6
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-01-09 12:40:03 -05:00 |
|
Raymond Yee
|
a174b3eb93
|
Putting in skeleton for pledge cancel and complete PayPal callbacks
|
2012-01-09 12:36:03 -05:00 |
|
Andromeda Yelton
|
69ecc313de
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-01-09 11:50:58 -05:00 |
|
Andromeda Yelton
|
a9fc98b771
|
work page now displays a modify-pledge button where appropriate. not yet wired to modification functionality.
|
2012-01-09 11:50:48 -05:00 |
|
eric
|
eeb594588e
|
Merge branch 'master' into generic_id
|
2012-01-07 17:46:29 -05:00 |
|
Raymond Yee
|
ecccf2adbb
|
Merge branch 'payment' of github.com:Gluejar/regluit
|
2012-01-06 13:47:52 -05:00 |
|
Raymond Yee
|
5dc6e771b5
|
Merge branch 'master' of github.com:Gluejar/regluit into payment
|
2012-01-06 13:39:33 -05:00 |
|
Andromeda Yelton
|
9d8bf7be69
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-01-06 11:04:17 -05:00 |
|
Andromeda Yelton
|
8460fba0bb
|
organizing the FAQ
|
2012-01-06 10:42:17 -05:00 |
|
Raymond Yee
|
be67d9e14f
|
Allow modifications if the amount is equal to max amount (not just less)
Fixed a small typo in the comments for payment.views
|
2012-01-06 10:32:52 -05:00 |
|
Raymond Yee
|
7012039aef
|
Merge branch 'jkace' of github.com:Gluejar/regluit into payment
|
2012-01-05 15:21:45 -05:00 |
icellama21
|
e9d293199c
|
Fixing bug in paypal checkStatus to separate preapproval max_amount from current amount
|
2012-01-05 12:56:20 -05:00 |
|
Raymond Yee
|
5e91827366
|
addition of max_amount to payment.models.Transaction
|
2012-01-05 09:55:18 -05:00 |
|
Raymond Yee
|
17f0c4986e
|
Merge branch 'jkace' of github.com:Gluejar/regluit into payment
|
2012-01-05 09:44:22 -05:00 |
icellama21
|
b0b6d83f75
|
Adding payment code for refund and modification of existing transactions
|
2012-01-05 01:42:05 -05:00 |
|
Raymond Yee
|
8ba7570ea1
|
Adding a "thank you" to the pledge page
|
2012-01-04 21:14:58 -05:00 |
|
Raymond Yee
|
9182affeda
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-01-04 17:21:39 -05:00 |
|
Raymond Yee
|
13b01c2838
|
Added a test to ensure that a user needs to be logged in for the pledge view.
|
2012-01-04 17:14:37 -05:00 |
|
Andromeda Yelton
|
96587a0a2d
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-01-04 12:51:45 -05:00 |
|
Andromeda Yelton
|
8e04bf3419
|
expanding the faq
|
2012-01-04 12:51:34 -05:00 |