eric
0cdac29c22
apply intcomma to currency display everywhere and add humanize
2012-05-13 15:32:32 -04:00
Raymond Yee
5cf4c17c33
Put in the right BASE_URL for production
2012-05-12 08:28:17 -07:00
Raymond Yee
43162c0406
On second thoughts, let's just try the sandbox first on unglue.it, then clear the transactions and the turn on the real money....
2012-05-12 08:10:31 -07:00
Raymond Yee
50d6998a92
TURNING THE REAL AMAZON PAYMENT SYSTEM ON!!!
2012-05-12 08:06:51 -07:00
Raymond Yee
1633b5a32d
Make it easier to flip the switch on whether to run the FPS sandbox or the real thing
2012-05-10 09:03:10 -07:00
Raymond Yee
9aa586181e
Wrapping the import of FPS keys in amazon.py so that things won't die if it gets imported before the database gets set up -- these changes don't break amazon functionality on ry's laptop and hopefully will be ok for jenkins.
2012-05-10 08:08:58 -07:00
Raymond Yee
069342276b
Merge branch 'ry'
2012-05-09 18:04:56 -07:00
Raymond Yee
16bb539931
Put please into paypay mode
2012-05-10 00:50:31 +00:00
Raymond Yee
090d36de66
[ #29272807 ] implemented storage of FPS_* keys in the db
2012-05-09 17:16:49 -07:00
Raymond Yee
9b2693ed8b
[ #29272807 ] Implementation of an encrypted keystore as core.models.Key
...
NOTE MIGRATION needed
* Immediate reason for this implementation is to make it harder for our AWS keys to be compromised -- this will allow us to store them in encrypted (AES 256) form in the db, which will require ability to run mysql on the EC2 instance
* depends on a Django settings.SECRET_KEY, which for now, we might store in settings/local.py -- we could get fancier about how to serve that up
2012-05-08 16:08:36 -07:00
Raymond Yee
6c829a0556
Fix the BASE_URL for just
2012-05-08 16:21:13 +00:00
Raymond Yee
11c79b1f89
Add site number for just.unglueit.com
2012-05-07 12:06:59 -07:00
Ed Summers
04c9a46ede
Forgot to add settings/just.py
2012-05-07 19:05:58 +00:00
Raymond Yee
70210dca95
add looking for settings.local to the settings files
...
fabfile.list_backups
first cut at aws.create_dbinstance and aws.db_info
2012-05-05 13:45:50 -07:00
Raymond Yee
30c72f07e3
Have settings/common.py attempt to import a settings/aws.py to allow keys to be stored outside of github
2012-05-03 16:48:51 -07:00
Raymond Yee
a62d988249
Merge branch 'ry' of github.com:Gluejar/regluit
2012-05-03 18:41:21 +00:00
Raymond Yee
3725094aea
A few more steps needed to get rid of billing (aka django-merchant)
2012-05-03 11:17:27 -07:00
Raymond Yee
d2dccbd1c3
add a PAYMENT_PROCESSOR setting to common.py
2012-05-02 18:34:13 -07:00
Raymond Yee
b9bbecb351
Merge branch 'master' of github.com:Gluejar/regluit into fps
...
Conflicts:
settings/common.py
settings/dev.py
settings/prod.py
2012-05-02 18:01:20 -07:00
eric
61a4878b54
[finish #24030945 ] tested it! scheduled notification for 12:30 at night via celerybeat. fixed various messge problems.
2012-04-28 13:02:38 -04:00
eric
6cd6064387
[start #24030945 ] notification that ebooks have been added to database
2012-04-27 17:29:57 -04:00
Raymond Yee
803a49e5d7
Merge branch 'master' of github.com:Gluejar/regluit into fps
2012-04-24 11:57:00 -07:00
Raymond Yee
85797b11a7
incorporating host settings for FPSConnection
2012-04-23 17:12:36 -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
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
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
0969e05486
Test the spam raymond celerybeat task
2012-04-17 13:49:21 -07:00
Raymond Yee
f41265be6d
Turning on notification emission on please
2012-04-17 12:38:53 -07:00
Raymond Yee
b808ddbed0
Added URLs needed for the return from Amazon authorization.
...
Also forgot to put keys in prod.py
2012-04-11 10:37:41 -07:00
Raymond Yee
11be270cfd
Added AWS parameters to various settings files
2012-04-11 09:53:20 -07:00
Raymond Yee
00511e4730
First pass at trying to integrate Amazon fps
2012-04-11 09:51:18 -07:00
Raymond Yee
7690345aec
Added more documentation on setting up celerybeat to README.md
...
updated deployment scripts to launch celerybeat
2012-04-05 15:07:27 -07:00
Raymond Yee
7b4ed8830e
Make modifications to please.py and prod.py to reflect fact that common.py has base definitions for celerybeat tasks
2012-04-05 14:07:55 -07:00
Raymond Yee
8a0ed638d3
Add import regluit and datetime to common.py
2012-04-05 13:56:42 -07:00
Raymond Yee
600f2e7075
Put definition of CELERYBEAT variables in common.py and definition of some common tasks but don't turn them on in common -- do that in the respective local setups
2012-04-05 13:54:46 -07:00
Raymond Yee
2aae2f64c1
Added necessary import to settings -- datetime and regluit
2012-04-05 13:44:47 -07:00
Raymond Yee
b23f354029
Add the same celerybeat jobs configuration to production
2012-04-05 13:41:58 -07:00
Raymond Yee
22a5b19b56
Configure some jobs for celerybeat on please
2012-04-05 13:40:53 -07:00
Raymond Yee
8a6de4ef1d
A proxy for the mailchimp js
2012-04-04 09:15:18 -07:00
Andromeda Yelton
883da1c873
Merge github.com:Gluejar/regluit
2012-03-29 16:28:04 -04:00
Andromeda Yelton
e4d98bd13e
context processors work better if you add them to settings
2012-03-29 16:26:22 -04:00
eric
62e5c4b518
this setting no longer used [ #27115145 ]
2012-03-29 16:14:44 -04:00
eric
30d7cbf1a9
either put the setting in common or the local settings, not both
2012-03-29 01:24:00 -04:00
Raymond Yee
2c12d84e2a
Set NOTIFICATION_QUEUE_ALL to True for now in various settings file
...
Added a few lines of documentation to signals.py around notifications
2012-03-27 14:53:07 -07:00
eric
26eddf38fd
install notification
2012-03-27 11:52:23 -04:00
eric
51cf67dca7
moved transaction settings to common.py
2012-03-26 16:18:31 -04:00