Commit Graph

409 Commits (997b771a6bd120928a51c789c91554542a171a68)

Author SHA1 Message Date
Raymond Yee 1aa6dff8f7 First pass at reading list of books from user 2011-10-25 14:20:10 -07:00
Raymond Yee 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
Raymond Yee 260a8ffa4d Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-10-25 07:11:50 -07:00
Raymond Yee d75ce34bf0 In the works: a method to retrieve books from a shelf 2011-10-25 07:10:59 -07:00
eric 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
Raymond Yee 7c645886bd Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-10-24 18:53:23 -07:00
Raymond Yee 12c883e0f6 Provide a more precise link to where to deny access to unglue.it to Goodreads 2011-10-24 18:36:12 -07:00
Raymond Yee 809517e99a Ooops...forgot other files I had actually changed. 2011-10-24 18:29:01 -07:00
Raymond Yee 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
eric b1cce24154 using post_save signal to make sure every user has a profile 2011-10-24 13:36:26 -04:00
Raymond Yee cc7b9907c8 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-10-24 07:22:33 -07:00
Ed Summers 3c05412b29 adding back in the style used by the edition list in the work view, that was removed. 2011-10-24 01:39:35 +00:00
Ed Summers ad6ac48f42 not sure why these were committed 2011-10-23 21:29:38 -04:00
eric e6216e35ac creates a profile if there's not one already 2011-10-23 14:40:06 -04:00
Raymond Yee 2aa91d88de Merge branch 'master' of github.com:Gluejar/regluit 2011-10-22 08:18:48 -07:00
Raymond Yee dcd4727c95 a start on showing how to embed a widget in a third party site 2011-10-22 08:18:04 -07:00
Andromeda Yelton 246924c03f still merging changes after internet librarian 2011-10-21 15:35:31 -04:00
Andromeda Yelton c7a760b4d3 added last campaign method to Work class to help with status display in frontend 2011-10-21 14:47:23 -04:00
Andromeda Yelton ce0d20a028 added random activation of some campaigns 2011-10-21 14:45:43 -04:00
Andromeda Yelton e41e1e7b6d just merging my local codebase post-internet librarian... 2011-10-21 12:51:07 -04:00
Raymond Yee 6aa01701a4 Got rid of explore sidebar in API help.
Got rid of 'undefined' class for something in widget we are currently calculating
2011-10-20 13:53:35 -07:00
Raymond Yee 3fb56a9c44 Place the API help page into the frame with the explorer sidebar. 2011-10-20 13:27:52 -07:00
Ed Summers 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
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 62dcf73570 Small correction:
django-admin.py celeryd --loglevel=INFO
2011-10-20 10:28:33 -07:00
Raymond Yee b1526ea284 Merge branch 'master' into tastypie2
Conflicts:
	core/models.py
2011-10-20 10:00:45 -07:00
Ed Summers e164744872 order editions by most recent to oldest 2011-10-20 05:42:49 +00:00
Ed Summers 07073f8620 have tasks return bookloader return values 2011-10-20 05:23:30 +00: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
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
Raymond Yee a2b622b061 Added status and current_total data to Campaign resource in the API.
Added an API help page to describe how to use the API and which shows a user's api_key and sample calls and link to campaign widgets.
Added facility to redirect back to current URL after sign in.
2011-10-19 17:08:17 -07:00
Raymond Yee 7212a31257 Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-10-19 10:47:52 -07:00
Raymond Yee ce9f04619a Removing Work.status because it doesn't meet current needs for how we think of the status of a work. 2011-10-19 10:41:13 -07:00
eric d9e4b06f99 don't render settings on somebody else's supporter page 2011-10-19 12:55:48 -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 cbb801b9d9 Merge branch 'master', remote branch 'origin' into tastypie2 2011-10-19 08:26:43 -07:00
eric 74e6f7a374 wired user profile edit form to supporter page
you can now edit tagline from supporter page
2011-10-19 03:13:29 -04:00
Raymond Yee 7810893c84 Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-10-18 23:09:31 -07: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 0a84f525f7 A first cut at a Work.status property: UNGLUED, ACTIVE CAMPAIGN, NO ACTIVE CAMPAIGN 2011-10-18 19:00:51 -07:00
Raymond Yee d5b45d75b1 Merge branch 'master', remote branch 'origin' into tastypie2 2011-10-18 19:00:11 -07:00
Ed Summers 55af98b05f artifact of some download? 2011-10-18 21:33:22 -04:00
Raymond Yee 3d676eae8c Merge branch 'master' into tastypie2 2011-10-18 16:46:46 -07: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