2b063e78d1
merge conflicts
2011-11-07 16:16:36 -05:00
abf3ec131e
wiring supporter and search icons and percent unglued to live data
2011-11-07 16:12:53 -05:00
b644b062de
added models for Claim and Rightsholder - be sure to migrate!
2011-11-07 15:42:03 -05:00
110b996769
added logic to display ebooks, badly for now
2011-11-07 15:39:02 -05:00
7635c1a701
fixing image display in search panel view
2011-11-07 11:04:09 -05:00
f73aa1b570
Added grabbing of pdf ebooks corresponding to edition
2011-11-06 17:49:25 -05:00
e1ea725d0f
ebooks must have a downloadUrl
2011-11-06 17:42:09 -05:00
45045b4e44
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-06 16:33:17 -05:00
22d904f1bf
added ebook model and add_b_oclc
2011-11-06 16:33:04 -05:00
96a3039434
fixing bugs resulting from am addition of last_campaign method
2011-11-06 15:24:16 -05:00
3915cef5d4
valid json (again)
2011-11-06 15:02:40 -05:00
882a0490aa
valid json (again)
2011-11-06 15:01:41 -05:00
dcc87644ab
jiggering things around so that the premium fixture works
2011-11-06 14:58:51 -05:00
fdcc679d28
migration for premiums
2011-11-06 14:51:56 -05:00
29afdb2ffd
valid json
2011-11-06 14:49:33 -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
672b1b3b20
Implemented LibraryThing import as a command and separated out LT functionality into a separate module
2011-11-01 17:42:39 -07:00
f7ea58a602
Integrated Goodreads shelf loading to wishlist into UI
2011-10-31 17:26:05 -07:00
ed4ea516c2
Storing goodreads info in user.profile
2011-10-29 15:40:00 -07:00
07248f16c8
dded a command to load a shelf to a user's wishlist
2011-10-26 09:49:54 -07:00
4a98a96aac
Added a command to load a shelf to a user's wishlist
2011-10-26 09:49:10 -07:00
a4dd33b047
Displaying some of the books from user shelf.
2011-10-25 16:07:44 -07:00
2f81b8cebd
Quick and dirty display of Goodreads books from user's shelf.
2011-10-25 16:00:52 -07:00
1aa6dff8f7
First pass at reading list of books from user
2011-10-25 14:20:10 -07:00
7894357f1d
Made sure that we don't try activate an already active campaign in generating random campaigns
2011-10-25 09:33:01 -07:00
260a8ffa4d
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-10-25 07:11:50 -07:00
d75ce34bf0
In the works: a method to retrieve books from a shelf
2011-10-25 07:10:59 -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
7c645886bd
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-10-24 18:53:23 -07:00
809517e99a
Ooops...forgot other files I had actually changed.
2011-10-24 18:29:01 -07:00
299d3d1be3
First take on Goodreads integration.
...
Can get userid, username, and display shelves info
Using sessions to store user info right now.
2011-10-24 18:09:30 -07:00
b1cce24154
using post_save signal to make sure every user has a profile
2011-10-24 13:36:26 -04: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
ce0d20a028
added random activation of some campaigns
2011-10-21 14:45:43 -04:00
e41e1e7b6d
just merging my local codebase post-internet librarian...
2011-10-21 12:51:07 -04:00
2e83847fa7
rolling back the add_related option on add_by_isbn until it is better thought out, and does not break the build...
2011-10-20 18:43:40 +00:00
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
07073f8620
have tasks return bookloader return values
2011-10-20 05:23:30 +00:00
dbcd8e3465
use redis in production environment for pub/sub instead of polling
2011-10-20 05:18:04 +00:00
a79de596bb
added production deployment information and scripts for celeryd
2011-10-20 04:36:41 +00: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
Andromeda Yelton
eric
Ed Summers
Raymond Yee
thatandromeda