daef075f5b
Fixing the incorrect passing of a Goodreads shelf name -- and also incorrect display of number of books on wishlist.
2011-11-15 12:51:38 -08:00
4348c08d3b
fixed html errors in base.html footer
2011-11-15 15:00:48 -05:00
83c48b5a92
somebody messed up the work page title
2011-11-15 14:40:23 -05:00
769348bf2e
more stuff rhtools
2011-11-15 14:35:03 -05:00
c6e9d33685
Merge branch 'goodreads' of github.com:Gluejar/regluit
2011-11-15 11:20:18 -08:00
96d264c8a1
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-15 11:08:58 -08:00
da108d0ae1
who wants a favicon? aw yeah
2011-11-15 13:54:13 -05:00
d139a4b693
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-15 10:40:44 -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
5ff5485194
grammar fix to hover text on badges
2011-11-15 13:12:03 -05:00
fdd8e55d9f
merging conflicts after creating workstub page
2011-11-15 11:32:30 -05:00
4424ee513f
titles on search results now link to work stub page
2011-11-15 11:27:32 -05:00
8478f3c4a7
rights holder tools now lists platform agreements that user administers; rights@gluejar.com is now an admin account
2011-11-15 10:01:01 -05:00
0328430169
first cut at UI for unglue.it admins to create rights holders and delegate ownership
2011-11-14 23:28:55 -05:00
4e2e460903
added rudimentary view of subjects to get an idea of what is in there already
2011-11-14 21:13:39 -05:00
8c3a4528fc
real title
2011-11-14 19:09:34 -05:00
008ae17e1e
trying to add facebook link
2011-11-14 19:04:49 -05:00
6a82ec5f1d
explore column now shows up to 5 "randomly" chosen ungluers
2011-11-14 15:16:36 -05:00
cee723524c
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-14 13:45:11 -05:00
34e245362f
added tooltips to clarify badges
2011-11-14 13:43:47 -05:00
4c65a11696
de-association from twitter and facebook are now supported
2011-11-14 13:23:26 -05:00
6b38e7d9b4
more comprehensively handling campaign states; grammar fix for singular vs. plural ungluers
2011-11-14 13:07:07 -05:00
1d9109a7d7
modified work.html to handle all campaign status options
2011-11-14 11:42:33 -05:00
17a382cbc8
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-14 10:21:39 -05:00
93acfc6348
improving work page's handling of campaign statuses
2011-11-14 10:19:52 -05:00
f3122e5161
corrected alt in avatars
2011-11-13 20:35:29 -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
aa79208a14
adding display of author name
2011-11-11 15:09:39 -05:00
38105c3de9
First pass at writing the celery tasks to the db and displaying them.
2011-11-10 15:14:33 -08:00
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
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
243778b40c
tweaking css for panel hover state
2011-11-08 21:23:23 -05:00
ba45db0e78
added live data to panel view hover state; put js that search & supporter share into separate files
2011-11-08 20:34:15 -05:00
3c33ca8bfa
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-08 11:28:55 -05:00
2173f16d4e
panel view now has a hover state on supporter page
2011-11-08 11:28:35 -05:00
4c29afdb94
fixed work template errror
2011-11-07 17:01:21 -05:00
ec9b69e012
removed support button if no campaign
2011-11-07 16:56:23 -05: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
a40cab0184
First take on integrating pledge
2011-11-07 16:01:08 -05:00
7d44516189
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-07 15:39:05 -05:00
110b996769
added logic to display ebooks, badly for now
2011-11-07 15:39:02 -05:00
268c669b76
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-07 15:12:12 -05:00
51d8c71069
aligned search box with main content container; fixed flow of panel view in search page; added bottom-padding to allow for cover images to be fully displayed in list view
2011-11-07 15:11:52 -05:00
fa601f7dd4
fixed which wishlist being read by Ajax update for goodreads
2011-11-07 12:19:45 -05:00
7753c49656
James K. Polk did not actually write every book in our database
2011-11-07 11:58:48 -05:00
a1055a01aa
resolving merge conflicts
2011-11-07 11:06:01 -05:00
7635c1a701
fixing image display in search panel view
2011-11-07 11:04:09 -05:00
609b829f5c
fixed missing style on support menu
2011-11-07 10:45:10 -05:00
46070801d6
changed search.html css to work with toggling (toggle toggle toggle)
2011-11-07 09:59:23 -05:00
7c38ff7509
wired in setup_campaign
2011-11-06 18:56:33 -05:00
31b0fca4fe
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-06 18:45:06 -05:00
852125ff8a
you can now toggle the supporter page between list and panel views. it's pretty badass.
2011-11-06 18:43:04 -05:00
997b771a6b
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-06 17:44:56 -05:00
214e1c5ff8
pull in premiums from the campaign
2011-11-06 17:44:50 -05:00
66e6de0ffa
templatize campaignsetup; add last class to premium display
2011-11-06 17:33:11 -05:00
e18a6dd98c
campaign display tweaks
2011-11-06 16:53:39 -05:00
e76df1d76a
removed old work view and converted campaign view to work view
2011-11-06 16:46:46 -05:00
cba17474c9
refactoring CSS. now sitewide.css is part of base.html and other files should be applied as appropriate.
2011-11-06 16:16:23 -05:00
96a3039434
fixing bugs resulting from am addition of last_campaign method
2011-11-06 15:24:16 -05:00
26280b9c75
needs to use last_campaign_status method, not last_campaign.status, lest last_campaign return None
2011-11-06 14:34:15 -05:00
c948a6b090
fixing campaign status display
2011-11-06 14:32:29 -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
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
91c3ccb0e7
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-02 16:47:12 -07:00
0b891cc8b5
pages we need but do not yet have now link to stubs
2011-11-02 15:40:43 -04: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
d6fc0b6230
Refining display of Goodreads import
2011-11-01 14:09:04 -07: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
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
a4dd33b047
Displaying some of the books from user shelf.
2011-10-25 16:07:44 -07:00
1aa6dff8f7
First pass at reading list of books from user
2011-10-25 14:20:10 -07:00
260a8ffa4d
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-10-25 07:11:50 -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
12c883e0f6
Provide a more precise link to where to deny access to unglue.it to Goodreads
2011-10-24 18:36:12 -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
246924c03f
still merging changes after internet librarian
2011-10-21 15:35:31 -04:00
e41e1e7b6d
just merging my local codebase post-internet librarian...
2011-10-21 12:51:07 -04: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
b1526ea284
Merge branch 'master' into tastypie2
...
Conflicts:
core/models.py
2011-10-20 10:00:45 -07:00
e164744872
order editions by most recent to oldest
2011-10-20 05:42:49 +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
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
d9e4b06f99
don't render settings on somebody else's supporter page
2011-10-19 12:55:48 -04:00
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
8cab4dc425
First pass integration of preapproval into campaign pledge form
2011-10-18 16:27:20 -07:00
8d27cfc89e
Merge branch 'master', remote branch 'origin' into payment_integration
2011-10-18 07:43:42 -07:00
5965687dbb
added some hopefully not too cheesy info about adding to wishlist when a user has an empty wishlist
2011-10-18 00:21:49 -04:00
1ddf12ddab
anon user gets redirected to login page when attempting to add an item to a wishlist. fixes https://www.pivotaltracker.com/story/show/19249923
2011-10-17 22:32:31 -04:00
cdca7c6525
include book_list.css so we the remove/add areas appear clickable
2011-10-17 21:35:58 -04:00
Raymond Yee
eric
Andromeda Yelton
Ed Summers
Andromeda Yelton