Commit Graph

472 Commits (2441158d676968a702b254de477b4109c5b599c3)

Author SHA1 Message Date
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 df8d1d9506 Put more logging into Goodreads handling to try to debug why shelf loading not working in some cases. 2011-11-10 07:36:17 -08:00
Raymond Yee a959d00508 Experiments with creating tasks and seeing how to manage them, especially how to create a custom state to track status of tasks. 2011-11-09 17:31:31 -08:00
Raymond Yee 49aca6428c The /pledge page now has the correct radio button to correpond to the premium clicked on.
HOWEVER, there's no enforcement currently of the pledge amount to be the same as the premium clicked on.
Also, no form validation on pledge page yet too.
2011-11-09 10:05:03 -08:00
eric 3a7ba8cb45 fixed bug https://www.pivotaltracker.com/story/show/20482327
also added error output on profile edit form
2011-11-09 12:24:26 -05:00
Ed Summers 7cf40e88de need to import Q 2011-11-07 16:04:37 -05:00
Raymond Yee a40cab0184 First take on integrating pledge 2011-11-07 16:01:08 -05:00
Ed Summers 110b996769 added logic to display ebooks, badly for now 2011-11-07 15:39:02 -05:00
Ed Summers 6fe1ad049c pull in all premiums 2011-11-07 10:18:46 -05:00
Ed Summers 3bd3467152 need pass premiums to the template 2011-11-07 09:50:26 -05:00
eric 7c38ff7509 wired in setup_campaign 2011-11-06 18:56:33 -05:00
Ed Summers 09fd66b107 need to pass premiums off to the work template if there is an active campaign 2011-11-06 18:38:33 -05:00
Ed Summers 214e1c5ff8 pull in premiums from the campaign 2011-11-06 17:44:50 -05:00
Ed Summers e76df1d76a removed old work view and converted campaign view to work view 2011-11-06 16:46:46 -05:00
Andromeda Yelton 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
Andromeda Yelton 2dcf1dfbee Merge branch 'master' of github.com:Gluejar/regluit 2011-11-03 16:30:36 -04:00
Andromeda Yelton 2c6a7e6f94 book panel view of supporter page now half-done; visible at /supporter2/username 2011-11-03 16:28:53 -04:00
Raymond Yee 91c3ccb0e7 Merge branch 'master' of github.com:Gluejar/regluit into goodreads
Conflicts:
	frontend/urls.py
2011-11-02 16:47:12 -07:00
Andromeda Yelton 0b891cc8b5 pages we need but do not yet have now link to stubs 2011-11-02 15:40:43 -04:00
Raymond Yee fa1806759b Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-01 14:24:18 -07:00
Andromeda Yelton c139e4dcfc adding option for supporters to pledge anonymously 2011-11-01 17:08:09 -04:00
Andromeda Yelton 60f29fc98c needed some exception handling 2011-11-01 16:21:38 -04:00
Raymond Yee 90cfdb9007 Added ability to clear wishlist 2011-11-01 10:41:39 -07:00
Raymond Yee 6f1ebb3247 Embedding api_key and username to get a functioning API call into goodreads_display.html 2011-11-01 09:50:05 -07:00
Raymond Yee f7ea58a602 Integrated Goodreads shelf loading to wishlist into UI 2011-10-31 17:26:05 -07:00
Raymond Yee ed4ea516c2 Storing goodreads info in user.profile 2011-10-29 15:40:00 -07:00
Raymond Yee a4dd33b047 Displaying some of the books from user shelf. 2011-10-25 16:07:44 -07:00
Raymond Yee 1aa6dff8f7 First pass at reading list of books from user 2011-10-25 14:20:10 -07:00
Raymond Yee 260a8ffa4d Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-10-25 07:11:50 -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 809517e99a Ooops...forgot other files I had actually changed. 2011-10-24 18:29:01 -07:00
eric b1cce24154 using post_save signal to make sure every user has a profile 2011-10-24 13:36:26 -04:00
eric e6216e35ac creates a profile if there's not one already 2011-10-23 14:40:06 -04: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
Ed Summers e164744872 order editions by most recent to oldest 2011-10-20 05:42:49 +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
eric d9e4b06f99 don't render settings on somebody else's supporter page 2011-10-19 12:55:48 -04: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 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 d09bc33989 fix for https://www.pivotaltracker.com/story/show/19784723 2011-10-17 18:16:34 +00: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 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 5138e3d817 added back a search box so at least we can search for books to add to a wishlist while logged in, until we know where the search box should go 2011-10-13 22:32:30 -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 e0f1ef50cc Rewrote pledging to a campaign to integrate the testview into logic of CampaignFormView directly.
Allow configuration of where PayPal should return after transaction is completed.
2011-10-13 14:13:37 -07:00
Andromeda Yelton da3b41af9d fixing date format 2011-10-13 12:55:44 -04:00
Andromeda Yelton 206b722c5d Added logic to generate backed/backing/wished data for badge display 2011-10-13 12:23:57 -04:00
Raymond Yee f01d0c4df3 First cut at doing payment integration and understanding how to use class-based generic views 2011-10-12 10:47:48 -07:00
Raymond Yee 7e4f0a222b Ooops....forgot some files in previous commit 2011-10-11 10:03:40 -07: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 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
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 dea578e019 bugfix for https://www.pivotaltracker.com/story/show/19054387 2011-09-30 01:01:28 +00:00
Ed Summers 3f1eae3105 remove from wishlist functionality 2011-09-29 16:42:19 +00:00
Ed Summers 9a44cfc436 added remove from wishlist 2011-09-29 11:44:03 +00:00
Ed Summers dde1253dea removed print statements 2011-09-29 02:30:13 -04: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 23c4c48946 simplified privacy view to use direct_to_template generic view; now use render() from django 1.3 which is easier 2011-09-28 21:54:50 -04:00
Ed Summers 8a9f785c4e started adding back some search functionality 2011-09-29 01:36:47 +00:00
Ed Summers 195f6db360 redirect to supporter page if logged in 2011-09-27 09:27:15 +00:00
Andromeda Yelton ac5e372131 new designs for home and supporter pages, take 1 2011-09-21 11:11:36 -04:00
Andromeda Yelton a8dffead58 privacy policy now displays in footer 2011-09-13 14:35:06 -04:00
Ed Summers bb4003ecab should have been supporter not contributor ... 2011-09-12 18:20:36 +00:00
Ed Summers ab3216f778 renamed user view to contributor, since that is what eric has been calling it 2011-09-12 15:23:33 +00:00
Ed Summers 962543c541 need to distinguish between the user being viewed (subscriber for now) and the logged in user 2011-09-12 15:13:21 +00:00
Ed Summers 7720a73fb0 beginnings of a user wishlist display... 2011-09-12 01:53:54 -04:00
Ed Summers 4352743f13 initial pass at pulling in stefan's book panel templates 2011-09-11 23:44:21 -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