Commit Graph

414 Commits (b68ad58cc62c7b9512c354eae75c26952fad6430)

Author SHA1 Message Date
Ed Summers f119c7f3a7 starting fresh with migrations 2011-11-17 23:05:01 +00:00
Raymond Yee 5c8f2c5586 Putting in a key in jenkins.py for Goodreads 2011-11-16 13:33:10 -08:00
Raymond Yee 64829259fc Added a setting for debug_toolbar 2011-11-16 13:00:51 -08:00
Raymond Yee 5df81cc52e Merge branch 'master' of github.com:Gluejar/regluit into goodreads
Conflicts:
	frontend/urls.py
2011-11-16 11:58:39 -08:00
Raymond Yee 3be4e6fab4 First pass at integrating LT into the UI 2011-11-16 10:20:10 -08:00
Ed Summers e90b168e71 added new db account for please 2011-11-16 04:15:01 +00:00
Raymond Yee 45f58ae955 Merge branch 'master' of github.com:Gluejar/regluit into goodreads
Conflicts:
	frontend/urls.py
2011-11-15 10:37:19 -08:00
eric 8478f3c4a7 rights holder tools now lists platform agreements that user administers; rights@gluejar.com is now an admin account 2011-11-15 10:01:01 -05:00
Ed Summers 40d95acab4 added andromeda and eric to django admins 2011-11-14 16:36:38 +00:00
eric db3163b01b added twitter account association and profile image acquisiton
also added goodreads association url to UI for good measure
2011-11-12 16:36:31 -05:00
eric 2e00f6bbd0 added facebook association 2011-11-12 13:58:31 -05:00
Ed Summers dbea4ebb7a Merge branch 'master' of github.com:Gluejar/regluit 2011-11-11 17:34:46 -05:00
Ed Summers 08053cc4ba added my goodreads api key for please.unglueit.com 2011-11-11 17:33:58 -05:00
Raymond Yee 38105c3de9 First pass at writing the celery tasks to the db and displaying them. 2011-11-10 15:14:33 -08:00
Raymond Yee 11e441da09 Merge branch 'master' into goodreads 2011-11-09 10:38:13 -08:00
Ed Summers 4860ec430a added script to update please.unglueit.com 2011-11-09 18:22:23 +00:00
Raymond Yee 96939b59b7 Merge branch 'master' of github.com:Gluejar/regluit into goodreads
Conflicts:
	settings/dev.py
2011-11-08 09:51:27 -08:00
Raymond Yee a40cab0184 First take on integrating pledge 2011-11-07 16:01:08 -05:00
Raymond Yee 83b7bed56e introduce a setting to allow Celery messages to go to regular Python log 2011-11-06 18:32:43 -05:00
Raymond Yee 323856b0c1 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-06 15:09:17 -05:00
Ed Summers dcc87644ab jiggering things around so that the premium fixture works 2011-11-06 14:58:51 -05:00
Raymond Yee 68b4da17d1 Some code for OpenLibrary, Freebase, HathiTrust to explore the nature of the data available in those sources 2011-11-06 07:55:07 -05:00
Jason 9a6a3d260a Adding unique tracking ID to paypal payments 2011-10-27 02:35:46 -04:00
Raymond Yee 809517e99a Ooops...forgot other files I had actually changed. 2011-10-24 18:29:01 -07:00
Ed Summers 9901408b00 added list of supporters to the work page, just as a proof of concept more than anything. 2011-10-20 18:16:42 +00:00
Raymond Yee b1526ea284 Merge branch 'master' into tastypie2
Conflicts:
	core/models.py
2011-10-20 10:00:45 -07:00
Ed Summers 11e75cb0a9 added celery config for jenkins 2011-10-20 05:19:19 +00:00
Ed Summers dbcd8e3465 use redis in production environment for pub/sub instead of polling 2011-10-20 05:18:04 +00:00
Ed Summers a79de596bb added production deployment information and scripts for celeryd 2011-10-20 04:36:41 +00:00
Ed Summers 0c1411f2e8 added celery async task for add_related that gets exercised when a book is added to a wishlist. includes new settings for the djkombu celery backend 2011-10-19 23:31:16 -04:00
Raymond Yee 0ed1d229f5 Updating campaign widget to show status and progress. Don't have a way to calculate a graphic representation of progress yet. 2011-10-19 09:45:25 -07:00
Raymond Yee 8cab4dc425 First pass integration of preapproval into campaign pledge form 2011-10-18 16:27:20 -07:00
Raymond Yee 8d27cfc89e Merge branch 'master', remote branch 'origin' into payment_integration 2011-10-18 07:43:42 -07:00
Ed Summers cd805d14ab added raymond to the admins who get emailed with exceptions 2011-10-17 18:06:11 +00:00
Raymond Yee 0d21e77fd3 Merge branch 'master' of github.com:Gluejar/regluit into payment_integration 2011-10-17 07:23:59 -07:00
Ed Summers a621f9f2d9 turning off debug for prod settings 2011-10-14 20:37:44 +00:00
Raymond Yee e8c8f2dfc2 Got rid of a lot of code that was there to help RY learn about class based generic views.
Inserted a setting for the Gluejar paypal account email.
2011-10-13 19:16:28 -07:00
Ed Summers 030f2fbae7 needed to start over with clean slate for migrations since they were not being run as part of test suite, which was covering up some errors in the migrations 2011-10-10 22:31:24 -04:00
Ed Summers 89277a5e34 use textfield instead of charfield(10000) since Amazon RDS does not like them 2011-10-10 20:40:19 +00:00
Ed Summers f701cda168 need a jenkins settings file with a googlebooks api key for the tests to pass 2011-10-10 13:26:00 -04:00
Ed Summers d7f2101166 production apache and mod_wsgi configs 2011-10-07 03:14:29 +00:00
Jason 59ba9db4f6 Adding basic selenium powered unit tests for payments 2011-10-04 07:55:39 -04:00
Ed Summers 8175ea14f8 django-jenkins seems to use a whole lot of cpu and memory on ec2, to the point where it gets killed sometimes :-( 2011-10-04 01:03:12 -04:00
Ed Summers bc67cf937b try running regluit tests only w/ django-jenkins 2011-10-03 23:57:57 -04:00
Ed Summers 87d93ad915 going to try out django-jenkins management command 2011-10-03 23:33:12 -04:00
eric a4344e0afa didn't need django-profiles at all, Sorry! 2011-10-03 17:39:54 -04:00
eric 73c4ebde29 allow username setting and tagline in profile
started work on user profiles, with "tagline" field
the first a user signs in this google, they are redirected to a page
where they can set their username
2011-10-03 12:36:22 -04:00
Ed Summers 76e3b193d7 fixed failing tests related to interplay between django_extensions and south 2011-09-29 21:57:12 -04:00
Ed Summers 9a44cfc436 added remove from wishlist 2011-09-29 11:44:03 +00:00
Jason 37b46d01c2 Adding pledge payment support 2011-09-27 08:48:11 -04:00
Ed Summers 85079fd559 removed facebook and twitter from django-socialauth login/registration 2011-09-18 19:45:23 -04:00
Raymond Yee 9608f8efcb working starter API for Work 2011-09-12 13:02:06 -07:00
Ed Summers 2c7f858125 handle duplicates using openlibrary ids for edition, work and author 2011-09-10 11:36:38 +00:00
Ed Summers 0f5ff789ff lots of changes to support dynamically loading from openlibrary based on an isbn...which still needs some work to prevent duplication 2011-09-09 01:38:28 -04:00
Ed Summers 7ec16e58c3 Merge branch 'master' of github.com:Gluejar/regluit 2011-09-07 05:34:20 -04:00
Ed Summers ded6c1719f oops, should not have my real google key in here 2011-09-07 05:33:05 -04:00
Ed Summers e89f02bb13 unfortunate there are no TWITTER_EXTENDED_PERMISSIONS, and we cannot get an email address from them it seems :( 2011-09-06 04:13:24 +00:00
Ed Summers 0ce0369792 small style changes, and signal to update email if available from facebook 2011-09-06 03:50:38 +00:00
Ed Summers 4e3ae05990 added details about logins via twitter, facebook and google 2011-09-06 01:50:55 +00:00
Ed Summers 9e98be5b37 added django-social-auth for logins w/ google, twitter and facebook 2011-09-05 21:04:49 -04:00
Ed Summers b7ae2146c4 got the menu bar changing when a user is logged in again 2011-09-04 01:29:18 -04:00
Ed Summers 98301544a8 removed gmail credentials and modified the installation to give instructions for creating a settings.me settings module where you can put your gmail credentials, which will not be put in git 2011-09-04 01:04:04 -04:00
Ed Summers 6bd5824fc4 introduced django-registration for user management 2011-09-04 00:21:51 -04:00
Ed Summers 139a866bf6 setup api, core and frontend apps, also added initial homepage template from stefan 2011-08-30 23:46:55 -04:00