47a22f3ccb
Merge branch 'master' of github.com:Gluejar/regluit into fps
2012-04-26 15:50:49 -07:00
d84a76f443
A function to change RDS group parameter
2012-04-26 15:50:07 -07:00
274762d7de
[deliver #24088823 ] rights and filetype images for pd, cc books
2012-04-26 17:26:27 -04:00
c6b05bd577
footer now points to wordpress blog
2012-04-26 15:37:41 -04:00
4219149132
Small tweaks to get rid of remnants of PayPal IPN_* variables -- I can now use campaign_admin to actually move fake amazon bucks. Still some IPN_* stuff remaining to clean up.
2012-04-26 19:31:55 +00:00
2ab1df92c2
addressing user feedback, highlighting field validation errors better
2012-04-26 15:30:28 -04:00
061f656e63
Merge branch 'jkace' of github.com:Gluejar/regluit into fps
...
Also fixed things so that regluit.test.campaigntest.support_campaign runs for Amazon without error -- though I still need to confirm that the status of transactions properly handled
Next up: see whether this works for PayPal too.
Conflicts:
frontend/views.py
2012-04-25 13:10:53 -07:00
3bc14c1ac9
Modifying frontend/views to use new transaction status codes
2012-04-25 13:55:30 -04:00
8706e9a900
email sharing needs to populate the sender field in order to validate
2012-04-25 13:45:18 -04:00
6246b231b1
[finish #27115511 ] remove html from wishlist_active notice
2012-04-25 10:20:04 -04:00
3709fa3ba8
polish up notice settings [finish #27014673 ]
2012-04-25 10:06:22 -04:00
ae1983be3d
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-04-24 22:45:19 -04:00
78edf747a7
reorganize notifications [ #27014673 ]
2012-04-24 22:44:59 -04:00
028aa8f10d
reorganize notifications [ #27014673 ]
2012-04-24 22:44:19 -04:00
d0148cf6dc
[finish #28524505 ] add change email form
2012-04-24 22:20:10 -04:00
2a79a82dd7
detab text
2012-04-24 22:17:30 -04:00
709cb4ce41
now stuck on the status of an ACTIVE transaction in amazon in campaign_test
2012-04-24 18:03:57 -07:00
e7dcf098a3
Merge branch 'master' of github.com:Gluejar/regluit into fps
2012-04-24 14:44:03 -07:00
51d1bb938f
A change in the Goodreads API: http://www.goodreads.com/topic/show/867018-stuff-broken-since-last-thursday -- removing trailing '/' fixes the problem (for now!)
2012-04-24 14:37:33 -07:00
5ebbee7e7a
creating a regluit.test.campaigntest.support_campaign that also supports amazon fps
2012-04-24 11:58:00 -07:00
803a49e5d7
Merge branch 'master' of github.com:Gluejar/regluit into fps
2012-04-24 11:57:00 -07:00
15a08bdfeb
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-24 12:54:11 -04:00
a40e694faf
some phrasing help, plus made the offer details field not required
2012-04-24 12:54:05 -04:00
85797b11a7
incorporating host settings for FPSConnection
2012-04-23 17:12:36 -07:00
b6e0369b1c
Attempting to do a real testpayment
2012-04-23 13:54:37 -07:00
a11867d0bb
Merge branch 'jkace' of github.com:Gluejar/regluit into fps
2012-04-23 12:57:31 -07:00
df2dc3a8ca
Fixing bugs where amazon transaction status REFUNDED was not being set, or was overwriten by PaymentDetails
2012-04-23 15:37:25 -04:00
9299f36fa0
Merge branch 'jkace' of github.com:Gluejar/regluit into fps
2012-04-23 12:28:00 -07:00
337a692995
Adding redirect to pledge cancel and complete URLs when using amazon payment API
2012-04-23 15:24:16 -04:00
b4e424b9f5
Cleaning up amazon IPN logging messages
2012-04-23 15:09:43 -04:00
883ec1ce56
Adding uniform logging and boto exception handling to amazon payment code
2012-04-23 15:03:32 -04:00
931599f831
Adding PreapprovalDetails for amazon FPS payment system
2012-04-23 14:34:51 -04:00
d652767a79
change supporters to ungluers on work page tab, see if that helps overflow problem
2012-04-23 12:08:11 -04:00
565261c12b
Updated campaign_starter.sql to handle new migrations in payment
2012-04-21 16:17:51 -07:00
611e990c6a
Merge branch 'jkace' into fps
2012-04-21 16:15:07 -07:00
0d3765aa27
Fixed spelling of TRANSACITON_STATUS_COMPLETE_PRIMARY
2012-04-21 16:10:13 -07:00
71ba723d0a
Merge branch 'jkace' of github.com:Gluejar/regluit into fps
2012-04-21 14:44:47 -07:00
b1dbf8642f
Adding payment amazon module - IPN, Refund, Cancel, PaymentDetails support
2012-04-21 01:11:16 -04:00
05fa8d83a8
Updating payment manager update_payment for amazon compatibility, fixing status code bugs
2012-04-21 01:10:56 -04:00
cf5bb82b23
Adding payment transaction CREATED, FAILED status, fixing typo
2012-04-21 01:09:33 -04:00
3796002824
Adding amazon ipn to payment URLs
2012-04-21 01:09:03 -04:00
91090c60ac
Updating test views to use amazon return URL
2012-04-21 01:08:49 -04:00
8ffbd49230
Adding stub for local status in paypal-paymentdetails
2012-04-21 01:08:29 -04:00
dbdfbac2fe
Test data RY uses often to test campaigns....
...
cat test/campaign_starter.sql | django-admin.py dbshell
(e.g., java -jar test/selenium-server-standalone-2.20.0.jar > selenium-rc.log 2>&1 &
django-admin.py shell_plus
from regluit.test import campaigntest
s = campaigntest.support_campaign()
sel = s.next()
see screencast of what selenium script does: http://www.screencast.com/users/rdhyee/folders/Jing/media/34ebf6ed-d231-4839-87e5-6237825e8652
screencast is slightly out of date
2012-04-20 15:53:28 -07:00
e8b2619207
Adding payment transaction local_status, local IPN functions, separating payment execute and finish, and updates to the amazon FPS payment system
2012-04-20 15:59:08 -04:00
85f7909ce7
Adding python-dev to the list of dependencies -- because of pycrypto being used by ssh related libraries (boto? Fabric?)
2012-04-20 11:21:25 -07:00
34623e51ba
Merge branch 'production' of github.com:Gluejar/regluit
2012-04-20 10:21:38 -07:00
b87c514321
Forget the instruction to create /var/run/celery on production
2012-04-20 10:20:19 -07:00
0279253aa2
emit_notice.sh has to +x mode
...
added a db encoding for test db for production
2012-04-20 17:18:54 +00:00
9a73decf78
Merge branch 'jkace' of github.com:Gluejar/regluit into payment
2012-04-19 16:02:32 -07:00
Raymond Yee
eric
Andromeda Yelton
Raymond Yee
Jason
icellama21
Ed Summers