Commit Graph

2009 Commits (ea5664b08c074ac5bb2edf0762dc96b264adb4e1)

Author SHA1 Message Date
Raymond Yee 565261c12b Updated campaign_starter.sql to handle new migrations in payment 2012-04-21 16:17:51 -07:00
Raymond Yee 611e990c6a Merge branch 'jkace' into fps 2012-04-21 16:15:07 -07:00
Raymond Yee 0d3765aa27 Fixed spelling of TRANSACITON_STATUS_COMPLETE_PRIMARY 2012-04-21 16:10:13 -07:00
Raymond Yee 71ba723d0a Merge branch 'jkace' of github.com:Gluejar/regluit into fps 2012-04-21 14:44:47 -07:00
icellama21 b1dbf8642f Adding payment amazon module - IPN, Refund, Cancel, PaymentDetails support 2012-04-21 01:11:16 -04:00
icellama21 05fa8d83a8 Updating payment manager update_payment for amazon compatibility, fixing status code bugs 2012-04-21 01:10:56 -04:00
icellama21 cf5bb82b23 Adding payment transaction CREATED, FAILED status, fixing typo 2012-04-21 01:09:33 -04:00
icellama21 3796002824 Adding amazon ipn to payment URLs 2012-04-21 01:09:03 -04:00
icellama21 91090c60ac Updating test views to use amazon return URL 2012-04-21 01:08:49 -04:00
icellama21 8ffbd49230 Adding stub for local status in paypal-paymentdetails 2012-04-21 01:08:29 -04:00
Raymond Yee 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
icellama21 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
Raymond Yee 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
Raymond Yee 34623e51ba Merge branch 'production' of github.com:Gluejar/regluit 2012-04-20 10:21:38 -07:00
Raymond Yee b87c514321 Forget the instruction to create /var/run/celery on production 2012-04-20 10:20:19 -07:00
Ed Summers 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
Raymond Yee 9a73decf78 Merge branch 'jkace' of github.com:Gluejar/regluit into payment 2012-04-19 16:02:32 -07:00
Raymond Yee 9f970d6349 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-04-19 15:58:02 -07:00
Raymond Yee 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
Raymond Yee 929a70e498 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-04-19 12:58:13 -07:00
Ed Summers 9016331ed0 Changing to root password on please, which should be ok when please gets rebooted. 2012-04-19 18:40:46 +00:00
Raymond Yee 7fc0ae7165 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-04-19 10:56:53 -07:00
Raymond Yee 9af9c28645 Added command to get instances and snapshots
`
2012-04-19 10:53:22 -07:00
Andromeda Yelton 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
Raymond Yee 1aa9b5e550 crontab needs end of file 2012-04-18 19:07:02 -07:00
Raymond Yee c0dee5365a Trying to correct a complaint from crontab -- /bin/sh: no source 2012-04-18 19:05:40 -07:00
Raymond Yee 8619945838 [#27115145] implementing ubuntu crontab for production -- first job: django.admin emit_notices every minute 2012-04-18 18:32:13 -07:00
Raymond Yee 3bf4b1744d Added django-notification related panels to admin interface 2012-04-18 17:44:42 -07:00
Raymond Yee b9c272ae74 Removing stuff I had put into ry branch, specifically the experimental branch 2012-04-18 15:12:15 -07:00
Raymond Yee ac7f9afc2a Align ry back to master while keeping changes in random_tasks.py 2012-04-18 15:08:16 -07:00
Raymond Yee 3cf232a804 Merge branch 'master' of github.com:Gluejar/regluit into ry
Conflicts:
	core/signals.py
2012-04-18 15:01:47 -07:00
icellama21 d370091db7 Adding amazon FPS return view, execute and preapproval support 2012-04-18 16:22:00 -04:00
Raymond Yee 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
icellama21 125582eebd Adding new amazon payment module 2012-04-18 12:51:54 -04:00
icellama21 03e9947189 Adding basic amazon FPS Pay function 2012-04-18 11:53:13 -04:00
Raymond Yee c59923583b Merge branch 'master' of github.com:Gluejar/regluit into payment
Conflicts:
	settings/please.py
2012-04-18 08:13:38 -07:00
Raymond Yee 98cc04deb8 Turn off the spam Raymond 2012-04-17 14:07:14 -07:00
Raymond Yee abf72e78c8 Merge branch 'master' of github.com:Gluejar/regluit 2012-04-17 13:49:57 -07:00
Raymond Yee 0969e05486 Test the spam raymond celerybeat task 2012-04-17 13:49:21 -07:00
Andromeda Yelton e85ae79c35 Merge branch 'master' of github.com:Gluejar/regluit 2012-04-17 16:28:27 -04:00
Andromeda Yelton d78fbf963c notifications div ids replaced with snarkier, more-likely-to-be-unique text 2012-04-17 16:28:10 -04:00
Raymond Yee f41265be6d Turning on notification emission on please 2012-04-17 12:38:53 -07:00
eric d32190e905 [#27115511] removed user avatar from comment notices because it didn't look right next to book cover.
Can revisit with professional design help.
2012-04-17 15:16:07 -04:00
eric 8a24f860ee [#27470543] html fixes 2012-04-17 14:30:38 -04:00
eric 7791de3c29 fixed html error [#27310245] 2012-04-17 14:10:14 -04:00
Andromeda Yelton 8dda3369b5 minor language tweak per AM 2012-04-17 10:10:40 -04:00
Andromeda Yelton 9bdd8c9d72 Merge branch 'master' of github.com:Gluejar/regluit 2012-04-17 09:44:54 -04:00
Andromeda Yelton 434c6d048b synced label for and input id so that clicking anywhere on the label selects the radio button 2012-04-17 09:33:47 -04:00
Andromeda Yelton ecf1a7e604 selecting a premium now autofills pledge box with that number [#26659097] 2012-04-17 09:26:45 -04:00
Raymond Yee 38be468249 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-04-16 21:45:23 -07:00