Commit Graph

264 Commits (89768ef837c50369e11c68ecd7749989047a59b1)

Author SHA1 Message Date
Andromeda Yelton ec57b7efee user preference affects which MARC records we make available 2013-07-23 16:07:47 -04:00
Andromeda Yelton 1414ae5fa4 add user preference for MARC record link target 2013-07-23 09:53:07 -04:00
eric 1bebec42af what about public domain ebooks? 2013-07-19 13:13:53 -04:00
Andromeda Yelton 0e143b15ba persist information about where to find AWS files 2013-07-18 15:49:54 -04:00
Andromeda Yelton 54e422e217 parametrizing formats and license choices, bugfixing 2013-07-17 13:03:35 -04:00
Andromeda Yelton 2ea00389b3 minimal MARC support in database 2013-07-08 10:03:22 -04:00
Raymond Yee 63a3bac876 Trying a new key for prod.py too to see whether that will fix breakage in api calls 2013-07-02 07:37:12 -07:00
Raymond Yee 4333a480de Testing out new Google Books API key on just 2013-07-02 07:24:18 -07:00
Andromeda Yelton ad69580b2d PEP 8, PEP 328. I feel better now. 2013-06-03 12:31:39 -04:00
eric 1ee2d5c634 add a special response for failed social auths 2013-04-09 00:05:31 -04:00
eric fabc7e6802 merge from master again except views 2013-04-05 13:07:13 -04:00
Raymond Yee 25fedc69ee get prod out of production mode 2013-03-30 10:25:32 -07:00
Raymond Yee 1f522e0112 maintenance mode 2013-03-30 09:47:45 -07: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 95bf4d8ba9 Merge branch 's3_storage' of github.com:Gluejar/regluit into s3_storage 2013-02-11 11:28:13 -08:00
Raymond Yee 4f46760ab9 Remove prefix for CKEDITOR uploading on production 2013-02-11 11:24:32 -08:00
Raymond Yee e1318b5d1e Don't have any directory prefixes for CKEDITOR uploading in just 2013-02-11 19:18:16 +00:00
Raymond Yee ccb331c6ff Put in S3 keys for just and production 2013-02-11 10:47:03 -08: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
Raymond Yee 415aa84878 Added CKEDITOR_UPLOAD_PREFIX = 'https://unglue.it/static/media/' to prod.py 2013-02-04 07:58:26 -08:00
Raymond Yee 130478ca57 Added CKEDITOR_UPLOAD_PREFIX 2013-01-30 06:07:50 +00:00
eric c1c3b3d1ad [#40818125] minimum target to $500 2012-12-06 21:05:15 -05:00
Raymond Yee bf23675f5c get rid of PAYMENT_PROCESSOR setting in jenkins.py 2012-11-27 13:09:45 -08: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
Raymond Yee 603b2dacf9 set IS_PREVIEW on jenkins 2012-10-15 08:55:44 -07:00