91c3ccb0e7
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-02 16:47:12 -07:00
ee097ffd97
Added changes to zotero proof of concept code
2011-11-02 16:42:36 -07:00
0b891cc8b5
pages we need but do not yet have now link to stubs
2011-11-02 15:40:43 -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
6ddebadf87
Enough on goodreads for now.
2011-11-01 15:23:54 -07:00
fa1806759b
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-01 14:24:18 -07:00
6102b03c36
Allow Transaction.secret to be null. Created migration for payment/models
2011-11-01 14:16:27 -07:00
d6fc0b6230
Refining display of Goodreads import
2011-11-01 14:09:04 -07:00
c139e4dcfc
adding option for supporters to pledge anonymously
2011-11-01 17:08:09 -04:00
60f29fc98c
needed some exception handling
2011-11-01 16:21:38 -04:00
90cfdb9007
Added ability to clear wishlist
2011-11-01 10:41:39 -07:00
9e395e0a9f
converted all text-oriented pages to run on basedocumentation.html style template
2011-11-01 13:18:44 -04:00
6f1ebb3247
Embedding api_key and username to get a functioning API call into goodreads_display.html
2011-11-01 09:50:05 -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
db957c7ff6
Merge branch 'master' into goodreads
2011-10-28 12:48:31 -07:00
76e37a88a9
In supporter page:
...
* setting tab3 as the active one by default
* first attempt to sort books into the proper tab (though it's not totally accurate to say that books with successful last campaigns are the only unglued books
2011-10-28 12:36:04 -07:00
41b955245a
Some basic code for zotero, Librarything, amazon wishilst
2011-10-28 10:54:06 -07:00
f049e5ec91
Implementing check of paypal PAY transaction using PaymentDetails
2011-10-27 04:05:21 -04:00
9a6a3d260a
Adding unique tracking ID to paypal payments
2011-10-27 02:35:46 -04: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
12c883e0f6
Provide a more precise link to where to deny access to unglue.it to Goodreads
2011-10-24 18:36:12 -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
cc7b9907c8
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-10-24 07:22:33 -07:00
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
ad6ac48f42
not sure why these were committed
2011-10-23 21:29:38 -04:00
e6216e35ac
creates a profile if there's not one already
2011-10-23 14:40:06 -04:00
2aa91d88de
Merge branch 'master' of github.com:Gluejar/regluit
2011-10-22 08:18:48 -07:00
dcd4727c95
a start on showing how to embed a widget in a third party site
2011-10-22 08:18:04 -07: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
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
3fb56a9c44
Place the API help page into the frame with the explorer sidebar.
2011-10-20 13:27:52 -07: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
62dcf73570
Small correction:
...
django-admin.py celeryd --loglevel=INFO
2011-10-20 10:28:33 -07:00
b1526ea284
Merge branch 'master' into tastypie2
...
Conflicts:
core/models.py
2011-10-20 10:00:45 -07:00
Raymond Yee
Andromeda Yelton
Jason
eric
Ed Summers