Commit Graph

118 Commits (4354d3abeef444f1f1d1320722f101147cfbbf33)

Author SHA1 Message Date
eric 1ee2d5c634 add a special response for failed social auths 2013-04-09 00:05:31 -04:00
eric 097127ab7c resolve conficts in merge from master 2013-03-29 12:03:15 -04:00
eric 8366b08c69 get email_change working again 2013-03-27 17:57:08 -04:00
eric df443b41a5 Revert "'email_change' -> 'regluit.email_change'"
This reverts commit 329d35590a.
2013-03-27 15:03:30 -04:00
Raymond Yee 329d35590a 'email_change' -> 'regluit.email_change' 2013-03-26 10:58:49 -07:00
eric d905f288d7 merge from master 2013-03-22 16:45:41 -04:00
eric c26f9e1505 merge from master 2013-03-22 16:39:23 -04:00
eric 5229af0e3f session cookie from 2 weeks to 6 weeks 2013-03-21 10:13:32 -04:00
eric 50ec6ddb06 merge from master 2013-03-19 14:38:09 -04:00
eric af8c3ff1fd merge from master 2013-03-19 10:02:06 -04:00
eric 937f17eb73 and now everything works again 2013-03-18 14:56:27 -04:00
Raymond Yee f4f326ace8 Merge pull request #147 from Gluejar/fix_twitter_auth
update social auth and django to fix broken twitter auth
2013-03-15 15:48:37 -07:00
eric f719fb2ec3 migrate to pipeline 2013-03-15 12:29:11 -04:00
eric c93762b8ee update social auth and django
before this can be installed on an existing database, the following
south command must be applied:
django-admin.py convert_to_south social_auth
2013-03-14 23:46:01 -04:00
eric 54d0aa1d59 merge master into seo
schema.org stuff into work page
2013-03-13 10:48:36 -04:00
eric 28045aed77 merge master into improve_registration 2013-03-13 10:40:20 -04:00
eric 131010300a std install of email_change
decided not to use pip install because the code needs some mods, and
doesn't seem to be maintained.
2013-03-12 20:45:09 -04:00
thatandromeda 7dc1f4cba3 Merge pull request #129 from Gluejar/manager_supporter_msgs
Managers and staff can send messages to supporters [#36991391]
2013-03-12 11:52:43 -07:00
eric c037764289 sitemaps! [#25581139] 2013-03-09 17:37:33 -05:00
eric d3077c988b links should not point to http from https 2013-03-09 13:29:03 -05:00
eric 339d4653ab migrate and clean urls 2013-03-07 21:53:32 -05:00
eric a56222426e set queueing to use the master switch
use NOTIFICATION_QUEUE_ALL = False in m.py for testing
2013-03-04 23:11:50 -05:00
eric 14a6803b9f mailchimp integration [finish #37732465]
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
Raymond Yee a6eee0b854 1) use our custom django-ckeditor which tries to integrate django-storages: git+ssh://git@github.com/Gluejar/django-ckeditor.git@centralniak_merge
2) set in common.py placeholders for parameters needed by django-storages for S3
2013-02-08 09:57:23 -08:00
Raymond Yee f7cea12e12 settings for using django-storages and s3boto 2013-02-04 12:33:57 -08:00
eric c1c3b3d1ad [#40818125] minimum target to $500 2012-12-06 21:05:15 -05:00
Raymond Yee 6ab521faa1 Merge branch 'master' into charge_failed 2012-11-23 09:20:58 -08:00
Andromeda Yelton 84e13a42bf scheduling ending soon notification 2012-11-21 11:09:18 -05:00
Raymond Yee a90f133166 First pass at writing a signal handler to recharge transaction if account updated 2012-11-12 11:22:20 -08:00
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