86ff9ccdee
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-01-10 15:27:38 -08:00
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
9b6524c6fd
fleshing out the press kit
2012-01-10 16:27:31 -05:00
d7e5e6e1ed
Merge branch 'master' into generic_id
2012-01-10 15:40:15 -05:00
0d19018e62
api tests working; non-google id's working
2012-01-10 15:20:02 -05:00
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
162d521ddd
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-01-10 10:27:34 -08:00
dbfab2fa14
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2012-01-10 10:27:01 -08:00
7ca9a5f0a7
it is the skeleton of a press kit
2012-01-10 11:10:27 -05:00
95f32400ec
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-09 16:13:49 -05:00
556ecf8a06
now users can give us feedback on alpha
2012-01-09 15:53:09 -05:00
0b91017dd5
Did what edso told me not to do- re-architected db to use generic ids
2012-01-09 13:55:22 -05:00
a4957a5bf6
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-09 12:47:51 -05:00
a7009b1998
whoops, should probably commit the version that passes tests
2012-01-09 12:44:35 -05:00
2d1ab0dba6
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-09 12:40:03 -05:00
a174b3eb93
Putting in skeleton for pledge cancel and complete PayPal callbacks
2012-01-09 12:36:03 -05:00
69ecc313de
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-09 11:50:58 -05:00
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
eeb594588e
Merge branch 'master' into generic_id
2012-01-07 17:46:29 -05:00
ecccf2adbb
Merge branch 'payment' of github.com:Gluejar/regluit
2012-01-06 13:47:52 -05:00
5dc6e771b5
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-01-06 13:39:33 -05:00
9d8bf7be69
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-06 11:04:17 -05:00
8460fba0bb
organizing the FAQ
2012-01-06 10:42:17 -05:00
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
7012039aef
Merge branch 'jkace' of github.com:Gluejar/regluit into payment
2012-01-05 15:21:45 -05:00
e9d293199c
Fixing bug in paypal checkStatus to separate preapproval max_amount from current amount
2012-01-05 12:56:20 -05:00
5e91827366
addition of max_amount to payment.models.Transaction
2012-01-05 09:55:18 -05:00
17f0c4986e
Merge branch 'jkace' of github.com:Gluejar/regluit into payment
2012-01-05 09:44:22 -05:00
b0b6d83f75
Adding payment code for refund and modification of existing transactions
2012-01-05 01:42:05 -05:00
8ba7570ea1
Adding a "thank you" to the pledge page
2012-01-04 21:14:58 -05:00
9182affeda
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-01-04 17:21:39 -05:00
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
96587a0a2d
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-04 12:51:45 -05:00
8e04bf3419
expanding the faq
2012-01-04 12:51:34 -05:00
68f0c255d5
Force login on PledgeView as a whole
2012-01-04 12:03:50 -05:00
79e7d9d7df
grammar!
2012-01-04 11:34:31 -05:00
d106ff6f3d
Run only TransactionTest right now in payment.tests because others require selenium to run
2012-01-04 11:04:18 -05:00
65d04a151b
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-01-04 10:55:58 -05:00
c5e84d7006
Moved campaigntest.py to test/campaigntest.py
...
Added a simple selenium test to campaigntest to illustrate how to do a google search and test for the presence of text
Updated payment.tests to use the right settings for PayPal sandbox accounts
payment.tests.AuthorizeTest working for RY on laptop. PledgeTest is going through the motions but not quite working yet
2012-01-04 10:52:19 -05:00
4f33fbcbd1
using mod_rewrite now to redirect to https, also on the homepage now
2012-01-04 03:26:15 +00:00
aa10713e49
menu is more location-specific
2012-01-03 16:47:00 -05:00
a3fbf5d7b7
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-03 16:20:55 -05:00
7de1051448
it is not unlike a sidebar organizing the FAQs
2012-01-03 16:17:04 -05:00
eb147b3cd4
Added support for incomplete and completed payments in the PaymentManger query function
2012-01-03 14:49:37 -05:00
d3f25cd788
Added Receiver and PaymentResponse to admin interface
...
Dropping all Receiver and PaymentResponse in campaigntest.drop_all_transactions
Added a __unicode__ method to Receiver and PaymentResponse
Added some more documentation of PayPal status parameters
2012-01-03 13:37:20 -05:00
62a2a62efe
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-01-03 10:21:56 -05:00
7c018687d0
Add a simple comment to list the possible states of a Campaign
2012-01-03 10:20:17 -05:00
1986b37857
tidying book panel
2012-01-03 09:59:17 -05:00
81fc04ef12
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-01-03 09:53:51 -05:00
4292e1be0a
whitespace change
2012-01-03 09:53:29 -05:00
Raymond Yee
Andromeda Yelton
eric
icellama21
icellama21
Ed Summers