dcc87644ab
jiggering things around so that the premium fixture works
2011-11-06 14:58:51 -05:00
be44e36c61
Another syntax error fixed
2011-11-06 14:43:10 -05:00
02de354ae2
syntax error fix
2011-11-06 14:41:14 -05:00
6e81dce947
we need both last_campaign and last_campaign_status after all; template can't handle all the logic for status in event of last_campaign = None
2011-11-06 14:31:08 -05:00
773789dc99
percent_unglued function should handle case where last_campaign returns None
2011-11-06 14:24:54 -05:00
c1db972208
last_campaign should return None when there's no campaign rather than a string of text only relevant in one place
2011-11-06 14:16:29 -05:00
92b91d2dbe
model for premiums
2011-11-06 14:04:39 -05:00
f428634bf7
adding campaign page with live data; working on ability to switch between list and panel views on supporter page
2011-11-06 14:02:29 -05:00
2dcf1dfbee
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-03 16:30:36 -04:00
2c6a7e6f94
book panel view of supporter page now half-done; visible at /supporter2/username
2011-11-03 16:28:53 -04:00
ed4ea516c2
Storing goodreads info in user.profile
2011-10-29 15:40:00 -07:00
a4dd33b047
Displaying some of the books from user shelf.
2011-10-25 16:07:44 -07:00
260a8ffa4d
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-10-25 07:11:50 -07:00
559ff63aa3
added homepage url and twitter id to user profile model and form; reverted signalling
...
relying on signals to ensure that there's always a profile record
turned out to be a bad idea; django social auth signals are poorly
architected for this; and so it doesn't work. Catching exceptions
worked just fine, so I went back to that. Homepage and twitter buttons
now show only if they've been entered in settings. Twitter handle works
with or without '@' entered.
2011-10-24 23:32:32 -04:00
809517e99a
Ooops...forgot other files I had actually changed.
2011-10-24 18:29:01 -07:00
246924c03f
still merging changes after internet librarian
2011-10-21 15:35:31 -04:00
c7a760b4d3
added last campaign method to Work class to help with status display in frontend
2011-10-21 14:47:23 -04:00
e41e1e7b6d
just merging my local codebase post-internet librarian...
2011-10-21 12:51:07 -04:00
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
0d21e77fd3
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
2011-10-17 07:23:59 -07:00
491914a531
trying to fix campaign constraints with a migration
2011-10-14 19:37:22 +00:00
d79b228d39
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
...
Conflicts:
core/tests.py
2011-10-14 07:42:33 -07:00
b045f9388a
typo fix
2011-10-14 11:28:41 -03:00
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
a468012270
created methods to allow front end to see last campaign and percent unglued
2011-10-14 09:43:30 -04:00
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
319906774c
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
2011-10-13 14:25:51 -07:00
c0bd998732
First attempt to write out transactions associated with Campaign
2011-10-13 10:28:23 -07:00
da905147d9
added related_name to UserProfile to facilitate display of profile info
2011-10-13 12:22:38 -04:00
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
1b54ba5f6b
make sure there are some hits when adding a book by isbn
2011-10-10 17:26:38 -04:00
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
461d813f6a
Merge branch 'master' of github.com:Gluejar/regluit
2011-10-10 20:40:28 +00:00
89277a5e34
use textfield instead of charfield(10000) since Amazon RDS does not like them
2011-10-10 20:40:19 +00:00
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
c0f4ad11c3
merged upstream changes
2011-10-10 13:09:00 -04:00
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
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
711546f414
First pass at incorporating status into Campaign
2011-10-07 20:11:57 -07:00
68b94f768f
Changes in progress to the model
2011-10-07 14:17:54 -07:00
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
a4344e0afa
didn't need django-profiles at all, Sorry!
2011-10-03 17:39:54 -04:00
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
76e3b193d7
fixed failing tests related to interplay between django_extensions and south
2011-09-29 21:57:12 -04:00
409df080ce
got search passably working and a somewhat functional ajax add to list
2011-09-29 02:23:50 -04:00
f8095e9513
added and used Campaign.cover_image_small
2011-09-27 09:27:47 +00:00
6d6af629f4
added some api unit tests
2011-09-15 22:05:47 -04:00
7720a73fb0
beginnings of a user wishlist display...
2011-09-12 01:53:54 -04:00
67ef77a757
added management command to create random campaigns for any works that lack a campaign
2011-09-12 00:04:22 -04:00
1b5472f819
extra space
2011-09-10 11:41:36 +00:00
2c7f858125
handle duplicates using openlibrary ids for edition, work and author
2011-09-10 11:36:38 +00:00
c30d37064d
fall back to isbn-13 lookup on open library if isbn-10 is not there
2011-09-09 18:27:29 +00:00
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
0ce0369792
small style changes, and signal to update email if available from facebook
2011-09-06 03:50:38 +00:00
79f9f88213
added wishlist model, and a simplistic module books.py for looking up books by isbn at googlebooks and openlibrary
2011-09-02 00:10:54 -04:00
139a866bf6
setup api, core and frontend apps, also added initial homepage template from stefan
2011-08-30 23:46:55 -04:00
Ed Summers
Raymond Yee
thatandromeda
eric
Andromeda Yelton