Commit Graph

68 Commits (a6e8d115db1e02a14d988594f54da3afd9a2470e)

Author SHA1 Message Date
Ed Summers a6e8d115db 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:28:36 -04:00
Ed Summers 76b70f3676 minor doc fix 2011-10-18 23:47:48 -04:00
Ed Summers 7bfb7c3f7f need to trap errors when looking up a LibraryThing ISBN in GoogleBooks and getting no hit 2011-10-18 23:45:02 -04:00
Ed Summers 5c88878a30 added merge_works function for merging the one work into another when adding related editions based on ThingISBN. also added a test that makes sure related campaigns and wishlists are appropriately updated. 2011-10-18 23:00:07 -04:00
Raymond Yee 8cab4dc425 First pass integration of preapproval into campaign pledge form 2011-10-18 16:27:20 -07:00
Raymond Yee f92f39dc35 don't run settings.me/settings.dev alignment if we can't import modules 2011-10-18 08:02:49 -07: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 d69c881035 forgot the initial migration :-) 2011-10-14 16:13:06 -04:00
Ed Summers 5b102a6685 wiping migrations again and hoping they work this time. also catch exceptions when adding related editions. 2011-10-14 16:03:43 -04:00
Ed Summers 491914a531 trying to fix campaign constraints with a migration 2011-10-14 19:37:22 +00:00
Raymond Yee 38166177c4 First cut of PaymentDetails
small fix to explicitly calculate URI of PayPalIPN url pattern
update status of a PAY transaction to CREATED instead of leaving as None
2011-10-14 10:52:17 -07:00
Raymond Yee d79b228d39 Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
Conflicts:
	core/tests.py
2011-10-14 07:42:33 -07:00
Ed Summers 84337fae23 model change needs a migration 2011-10-14 14:36:02 +00:00
thatandromeda b045f9388a typo fix 2011-10-14 11:28:41 -03:00
Ed Summers bc24d0ea71 activate the random campaigns 2011-10-14 14:26:57 +00:00
Ed Summers 93404d42ff when a user views another users contributor page, works they already have on their wishlist show up that way instead of as "add to wishlist" 2011-10-14 14:18:38 +00:00
Ed Summers 44449f56a3 added some comments 2011-10-14 00:12:20 -04:00
Ed Summers ffe84fa46a got bookloader.add_related working w/ some tests. also added Edition.language because it looks like it will be useful to know. 2011-10-14 00:02:19 -04: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
Raymond Yee 319906774c Merge branch 'master' of github.com:Gluejar/regluit into payment_integration 2011-10-13 14:25:51 -07:00
Raymond Yee c0bd998732 First attempt to write out transactions associated with Campaign 2011-10-13 10:28:23 -07:00
Andromeda Yelton 145c275795 Merge branch 'master' of github.com:Gluejar/regluit
Conflicts:
	core/management/commands/random_campaigns.py
2011-10-13 12:46:52 -04:00
Andromeda Yelton da905147d9 added related_name to UserProfile to facilitate display of profile info 2011-10-13 12:22:38 -04:00
Andromeda Yelton 3773a6dd9c switched to decimal to address python 2.6/2.7 compatibility bug 2011-10-13 12:21:53 -04:00
Ed Summers 983c045a8c added bookloader.thingisbn and a test 2011-10-12 21:59:46 -04:00
Raymond Yee d82cda07ba Load campaign with Decimal target amount. 2011-10-12 15:48:41 -07:00
Ed Summers c69acd54ac the new initial migration for core 2011-10-10 22:31:45 -04: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 35abaf4237 this seemed to duplicated schema changes covered in previous migrations 2011-10-11 01:34:32 +00:00
Ed Summers 5e9439b965 reduced number of queries needed when displaying when a book is already on a user wishlist 2011-10-10 18:08:53 -04:00
Ed Summers 1b54ba5f6b make sure there are some hits when adding a book by isbn 2011-10-10 17:26:38 -04:00
Raymond Yee 67a5731592 I had forgotten the migrations for fields to support Campaign.status -- they are included here.
Now, Campaign.current_total is a property holding current amount of $ pledged/authorized.
2011-10-10 13:56:53 -07:00
Ed Summers 461d813f6a Merge branch 'master' of github.com:Gluejar/regluit 2011-10-10 20:40:28 +00: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
Raymond Yee ca2fc9afdc I've wrapped Campaign.status with a property decorator -- access campaign status as campaign.status not campaign.status() now. 2011-10-10 13:35:22 -07:00
Ed Summers e25894d549 added X-Forwarded-For for gluejar.com for the moment 2011-10-10 15:57:12 -04:00
Ed Summers c0f4ad11c3 merged upstream changes 2011-10-10 13:09:00 -04:00
Ed Summers 70a620b27f moved to using googlebooks api for data. required moving authors and subjects to be associated to editions, since we google books does not have a notion of a work 2011-10-10 12:57:10 -04:00
Ed Summers a905d6c820 added test of required fields for Campaign 2011-10-09 14:48:03 -04:00
Ed Summers 90859811a9 simplified some things since the database schema does not allow for campaigns that lack a name, description or work 2011-10-09 14:27:27 -04:00
Raymond Yee 711546f414 First pass at incorporating status into Campaign 2011-10-07 20:11:57 -07:00
Raymond Yee 68b94f768f Changes in progress to the model 2011-10-07 14:17:54 -07:00
Ed Summers e130cb10ae needed this default value for the migration to work properly on a clean database 2011-10-07 02:34:46 +00:00
Raymond Yee d67d77a9a0 Changed currency amounts to DecimalField in core and payment
Added south migrations to payment
Changed print statements to logger.info in payment
Added primitive paymentcomplete page in payment
2011-10-05 17:56:20 -07: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 53ceeb800c adjusted test to expect the title and isbns in the new location 2011-09-29 19:07:16 +00:00
Ed Summers 409df080ce got search passably working and a somewhat functional ajax add to list 2011-09-29 02:23:50 -04:00
Ed Summers f8095e9513 added and used Campaign.cover_image_small 2011-09-27 09:27:47 +00:00