Commit Graph

89 Commits (c4f32b38b543c5e48e88dea41180ce0355b45b77)

Author SHA1 Message Date
Andromeda Yelton 673b890e42 add production setting and only use google analytics in production 2012-10-23 10:24:16 -04:00
eric 1c5500a4e1 set NONPROFIT.is_on to false for launch 2012-10-12 13:47:43 -04:00
Andromeda Yelton 2bea7e89f4 Merge branch 'master' into pledge_pretty_stick
Conflicts:
	frontend/templates/pledge.html
	static/css/pledge.css
	static/less/pledge.less
2012-10-05 15:06:37 -04:00
Raymond Yee 68615b3b3d Merge branch 'update_manage_campaign' 2012-10-02 13:08:55 -07:00
Raymond Yee d0be2f8761 [#36469239] I can now get a transaction to work via stripelib.py now 2012-09-24 16:29:20 -07:00
Andromeda Yelton adefc43154 first pass 2012-09-24 14:21:15 -04:00
eric 63af76efc5 donation page 2012-09-21 17:15:30 -04:00
eric 8eeadc99d3 woo hoo, credit and donation scaffolding works end to end [#21784207] 2012-09-06 01:01:17 -04:00
eric f299d9ecf7 rip out paypal and amazon code 2012-08-31 03:12:15 -04:00
eric e8bd5ab2dc added ckeditor to manage campaign forms to provide rich text editing and image uploads [#32447975] 2012-07-27 14:23:44 -04:00
eric fdce89d17b Added language filtering [finish #24232285] 2012-07-21 16:26:16 -04:00
Raymond Yee f528fe3654 SERVER_EMAIL needs to be set to a verified SES email for mail_admins to work 2012-07-09 10:43:48 -07:00
Raymond Yee cf2847544b Fix the time when the campaign status dated -- 12:01 am -- maybe it should be 12:00 2012-06-29 18:22:19 -07:00
Raymond Yee 5b733d214c setting up to automate daily campaign status update 2012-06-29 18:05:14 -07:00
Andromeda Yelton 63143bf860 removing rest of is_preview 2012-06-13 13:30:39 -03:00
Raymond Yee 272d795ded Renaming the current functionality that has been named "cancel" to be "nevermind" because that functionality arose to support users changing their mind
The new PledgeCancel is a placeholder for the functionality I will build next to let users actually cancel existing transactions
Finally, I use  the setting.PAYMENT_PROCESSOR to set the default value of Transaction.host ('paypal' or 'amazon')
2012-05-18 16:59:48 -07:00
Raymond Yee 04ec596dc1 pieces of django-maintenance 2012-05-17 13:28:48 -07:00
eric 36a5e92d25 [finish #29677811] removed completely useless UNGLUEIT_SHORTEST_DEADLINE setting 2012-05-15 23:42:31 -04:00
eric 0cdac29c22 apply intcomma to currency display everywhere and add humanize 2012-05-13 15:32:32 -04: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 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 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 6cd6064387 [start #24030945] notification that ebooks have been added to database 2012-04-27 17:29:57 -04:00
Raymond Yee 85797b11a7 incorporating host settings for FPSConnection 2012-04-23 17:12:36 -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 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 8a6de4ef1d A proxy for the mailchimp js 2012-04-04 09:15:18 -07:00
Andromeda Yelton e4d98bd13e context processors work better if you add them to settings 2012-03-29 16:26:22 -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
Raymond Yee a252f9d173 [#22561067] Implemented regluit.utils.localdatetime.now is by default datetime.datetime.now() (in Django 1.3) and django.utils.timezone.now() in Django 1.4+
One overrides regluit.utils.localdatetime._now to do "time travel" -- useful for testing scenarios requiring time changes (such as Campaigns)
Get rid of call references to datetime.datetime.now() or utcnow() and datetime.date.today() in favor of regluit.utils.localdatetime.now() and date_today().
2012-03-09 00:45:39 +00:00
eric 3cc1ab23de account activation changed from 7 to 30 days 2012-03-03 17:26:50 -05:00
Andromeda Yelton 6b9c9a7653 changing version of jquery to 1.7.1 2012-02-14 11:28:48 -05:00
Andromeda Yelton 35d4fa4fd1 jquery back to local version for security reasons, only needed in common.py 2012-02-06 15:02:57 -05:00
Andromeda Yelton 7a94496c39 maybe the setting also needs to be in common to avoid breaking jenkins? 2012-02-06 14:29:47 -05:00
Ed Summers 61f9ff9980 forked please and prod configurations 2012-01-15 20:37:08 +00:00
Andromeda Yelton f7a042c9ef Merge branch 'master' of github.com:Gluejar/regluit 2012-01-15 14:57:18 -05:00
Andromeda Yelton c6f2e0b531 one more thing to display for preview only 2012-01-15 14:56:26 -05:00
eric 2508d1308e preview explore 2012-01-15 14:56:17 -05:00
Andromeda Yelton f80226fe5e minor additions to the press page, plus new users now go to supporter page on login 2012-01-12 13:57:50 -05:00
eric c2789350d0 We have comments! sync your dbs. 2011-12-30 22:08:04 -05:00
Andromeda Yelton 1ddbbf55a5 now there is a truncatechars filter, applied where relevant 2011-12-29 12:50:09 -05:00