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
9f970d6349
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-04-19 15:58:02 -07:00
ba9123ba39
Sets form action properly in pledge.html depending on whether new pledge or modified pledge.
...
campaigntest.support_campaign changed to handle new premium selection process, which now changes the preapproval amount
2012-04-19 15:43:21 -07:00
929a70e498
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-04-19 12:58:13 -07:00
9016331ed0
Changing to root password on please, which should be ok when please gets rebooted.
2012-04-19 18:40:46 +00:00
7fc0ae7165
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-04-19 10:56:53 -07:00
9af9c28645
Added command to get instances and snapshots
...
`
2012-04-19 10:53:22 -07:00
911f6f6212
pledge and pledge_modify don't need to use different templates, just an if statement or two. DRY
2012-04-19 10:50:40 -04:00
1aa9b5e550
crontab needs end of file
2012-04-18 19:07:02 -07:00
c0dee5365a
Trying to correct a complaint from crontab -- /bin/sh: no source
2012-04-18 19:05:40 -07:00
8619945838
[ #27115145 ] implementing ubuntu crontab for production -- first job: django.admin emit_notices every minute
2012-04-18 18:32:13 -07:00
3bf4b1744d
Added django-notification related panels to admin interface
2012-04-18 17:44:42 -07:00
b9c272ae74
Removing stuff I had put into ry branch, specifically the experimental branch
2012-04-18 15:12:15 -07:00
ac7f9afc2a
Align ry back to master while keeping changes in random_tasks.py
2012-04-18 15:08:16 -07:00
3cf232a804
Merge branch 'master' of github.com:Gluejar/regluit into ry
...
Conflicts:
core/signals.py
2012-04-18 15:01:47 -07:00
d370091db7
Adding amazon FPS return view, execute and preapproval support
2012-04-18 16:22:00 -04:00
e4352f4382
Putting into place a crontab for please
...
Adding django-admin.py emit_notices job to crontab
2012-04-18 09:57:32 -07:00
125582eebd
Adding new amazon payment module
2012-04-18 12:51:54 -04:00
03e9947189
Adding basic amazon FPS Pay function
2012-04-18 11:53:13 -04:00
c59923583b
Merge branch 'master' of github.com:Gluejar/regluit into payment
...
Conflicts:
settings/please.py
2012-04-18 08:13:38 -07:00
98cc04deb8
Turn off the spam Raymond
2012-04-17 14:07:14 -07:00
Raymond Yee
Andromeda Yelton
icellama21
Ed Summers