5df81cc52e
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-16 11:58:39 -08:00
d5a2b88768
Awesome Unglue.it Administration page added; will require a migration to add claim status
2011-11-16 14:45:37 -05:00
3be4e6fab4
First pass at integrating LT into the UI
2011-11-16 10:20:10 -08:00
2cc4d718a1
Added claim list on rh-tools. omitted claim display for non-rightsholders. fixed related name on claim model
2011-11-16 12:20:19 -05:00
86565dba6d
removed a conflicting migration. hopefully it will be this simple.
2011-11-15 21:13:42 -05:00
27d162c9d7
Now scraping LibraryThing view_style 5 to get at ISBNs of works -- as well as LC classification, subjects. Explicit parsing out of work_id and book_id
2011-11-15 17:14:28 -08:00
354b46085f
Approved rights holders get a claim form on work pages; still need to make a view that does the actual claiming
2011-11-15 18:20:29 -05:00
f83f046c7a
Make CeleryTask.function_args nullable: I forgot to commit migration
2011-11-15 13:50:04 -08:00
20b0ede3fc
make the function_args nullable in the model for CeleryTask
2011-11-15 13:35:50 -08:00
45f58ae955
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-15 10:37:19 -08:00
95f3991846
ungluer lists now shown in work view (the wished_by users) and search view( same as supporter)
2011-11-14 15:40:33 -05:00
6a82ec5f1d
explore column now shows up to 5 "randomly" chosen ungluers
2011-11-14 15:16:36 -05:00
5211e774a8
fixed librarything username length. migrate your schemas!
2011-11-14 10:17:31 -05:00
db3163b01b
added twitter account association and profile image acquisiton
...
also added goodreads association url to UI for good measure
2011-11-12 16:36:31 -05:00
f2ecff619f
added pic_url to user profile. migrate your schemas! connect to facebook adds your facebook profile pic
2011-11-12 15:02:47 -05:00
2e00f6bbd0
added facebook association
2011-11-12 13:58:31 -05:00
bc3b8333b6
added librarything_id and facebook_id to profile model, wired to supporter template; started faq
2011-11-11 22:51:22 -05:00
c8c5bd08d8
First pass at parsing LibraryThing collections by scraping HTML -- try it out using the librarything_load_books_2.py command
...
e.g.,
django-admin.py librarything_load_books_2 rdhyee
The command doesn't load books yet but just displays some info
2011-11-11 18:42:48 -08:00
08053cc4ba
added my goodreads api key for please.unglueit.com
2011-11-11 17:33:58 -05:00
38105c3de9
First pass at writing the celery tasks to the db and displaying them.
2011-11-10 15:14:33 -08:00
374196d763
Refined model for CeleryTask
2011-11-10 09:33:22 -08:00
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
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
274d4f691c
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-08 09:51:54 -08:00
96939b59b7
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
settings/dev.py
2011-11-08 09:51:27 -08:00
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
f98ed569c0
Added a simple adding task
2011-11-07 09:59:45 -05:00
2340ef05d4
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-06 17:51:39 -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
323856b0c1
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-06 15:09:17 -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
308730d90f
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-06 14:03:30 -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
705876dd8b
The shelf loading now uses the Oauth credential of the logged in user
2011-11-04 14:18:06 -07:00
820107bd4d
Got oauth signing to work with goodreads reviews_list
2011-11-04 14:04:32 -07: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
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
76b70f3676
minor doc fix
2011-10-18 23:47:48 -04:00
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
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
8cab4dc425
First pass integration of preapproval into campaign pledge form
2011-10-18 16:27:20 -07:00
f92f39dc35
don't run settings.me/settings.dev alignment if we can't import modules
2011-10-18 08:02:49 -07:00
0d21e77fd3
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
2011-10-17 07:23:59 -07:00
d69c881035
forgot the initial migration :-)
2011-10-14 16:13:06 -04:00
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
491914a531
trying to fix campaign constraints with a migration
2011-10-14 19:37:22 +00:00
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
d79b228d39
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
...
Conflicts:
core/tests.py
2011-10-14 07:42:33 -07:00
84337fae23
model change needs a migration
2011-10-14 14:36:02 +00:00
b045f9388a
typo fix
2011-10-14 11:28:41 -03:00
bc24d0ea71
activate the random campaigns
2011-10-14 14:26:57 +00: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
44449f56a3
added some comments
2011-10-14 00:12:20 -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
Raymond Yee
eric
Ed Summers
Andromeda Yelton
thatandromeda