Ed Summers
08053cc4ba
added my goodreads api key for please.unglueit.com
2011-11-11 17:33:58 -05:00
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
374196d763
Refined model for CeleryTask
2011-11-10 09:33:22 -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
274d4f691c
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-08 09:51:54 -08:00
Raymond Yee
96939b59b7
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
settings/dev.py
2011-11-08 09:51:27 -08:00
Andromeda Yelton
2b063e78d1
merge conflicts
2011-11-07 16:16:36 -05:00
Andromeda Yelton
abf3ec131e
wiring supporter and search icons and percent unglued to live data
2011-11-07 16:12:53 -05:00
eric
b644b062de
added models for Claim and Rightsholder - be sure to migrate!
2011-11-07 15:42:03 -05:00
Ed Summers
110b996769
added logic to display ebooks, badly for now
2011-11-07 15:39:02 -05:00
Andromeda Yelton
7635c1a701
fixing image display in search panel view
2011-11-07 11:04:09 -05:00
Raymond Yee
f98ed569c0
Added a simple adding task
2011-11-07 09:59:45 -05:00
Raymond Yee
2340ef05d4
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-06 17:51:39 -05:00
Raymond Yee
f73aa1b570
Added grabbing of pdf ebooks corresponding to edition
2011-11-06 17:49:25 -05:00
Ed Summers
e1ea725d0f
ebooks must have a downloadUrl
2011-11-06 17:42:09 -05:00
Ed Summers
45045b4e44
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-06 16:33:17 -05:00
Ed Summers
22d904f1bf
added ebook model and add_b_oclc
2011-11-06 16:33:04 -05:00
Andromeda Yelton
96a3039434
fixing bugs resulting from am addition of last_campaign method
2011-11-06 15:24:16 -05:00
Raymond Yee
323856b0c1
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-06 15:09:17 -05:00
Ed Summers
3915cef5d4
valid json (again)
2011-11-06 15:02:40 -05:00
Ed Summers
882a0490aa
valid json (again)
2011-11-06 15:01:41 -05:00
Ed Summers
dcc87644ab
jiggering things around so that the premium fixture works
2011-11-06 14:58:51 -05:00
eric
fdcc679d28
migration for premiums
2011-11-06 14:51:56 -05:00
Ed Summers
29afdb2ffd
valid json
2011-11-06 14:49:33 -05:00
Raymond Yee
be44e36c61
Another syntax error fixed
2011-11-06 14:43:10 -05:00
Raymond Yee
02de354ae2
syntax error fix
2011-11-06 14:41:14 -05:00
thatandromeda
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
thatandromeda
773789dc99
percent_unglued function should handle case where last_campaign returns None
2011-11-06 14:24:54 -05:00
thatandromeda
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
eric
92b91d2dbe
model for premiums
2011-11-06 14:04:39 -05:00
Raymond Yee
308730d90f
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-06 14:03:30 -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
Raymond Yee
705876dd8b
The shelf loading now uses the Oauth credential of the logged in user
2011-11-04 14:18:06 -07:00
Raymond Yee
820107bd4d
Got oauth signing to work with goodreads reviews_list
2011-11-04 14:04:32 -07: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
672b1b3b20
Implemented LibraryThing import as a command and separated out LT functionality into a separate module
2011-11-01 17:42:39 -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
07248f16c8
dded a command to load a shelf to a user's wishlist
2011-10-26 09:49:54 -07:00
Raymond Yee
4a98a96aac
Added a command to load a shelf to a user's wishlist
2011-10-26 09:49:10 -07:00
Raymond Yee
a4dd33b047
Displaying some of the books from user shelf.
2011-10-25 16:07:44 -07:00
Raymond Yee
2f81b8cebd
Quick and dirty display of Goodreads books from user's shelf.
2011-10-25 16:00:52 -07:00
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
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
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
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
Ed Summers
07073f8620
have tasks return bookloader return values
2011-10-20 05:23:30 +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
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
Andromeda Yelton
a468012270
created methods to allow front end to see last campaign and percent unglued
2011-10-14 09:43:30 -04: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