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
7cf40e88de
need to import Q
2011-11-07 16:04:37 -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
9ba845ba6e
Merge branch 'master' of https://github.com/Gluejar/regluit
2011-11-07 10:48:16 -05:00
609b829f5c
fixed missing style on support menu
2011-11-07 10:45:10 -05:00
e3c2ee3498
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-07 10:18:58 -05:00
6fe1ad049c
pull in all premiums
2011-11-07 10:18:46 -05:00
eab72eb48a
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-07 09:59:40 -05:00
46070801d6
changed search.html css to work with toggling (toggle toggle toggle)
2011-11-07 09:59:23 -05:00
3bd3467152
need pass premiums to the template
2011-11-07 09:50:26 -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
09fd66b107
need to pass premiums off to the work template if there is an active campaign
2011-11-06 18:38:33 -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
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
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
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
e6216e35ac
creates a profile if there's not one already
2011-10-23 14:40:06 -04: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
f870cc6243
added regression test for non-logged in user viewing the supporter page
2011-10-17 18:37:31 +00:00
d09bc33989
fix for https://www.pivotaltracker.com/story/show/19784723
2011-10-17 18:16:34 +00:00
0d21e77fd3
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
2011-10-17 07:23:59 -07:00
bb3a445a79
put a bit of temporary whitespace in between the footer
2011-10-14 20:48:40 +00:00
d5badd0f7e
shortened width of search box a teensy bit so that it does not break in half
2011-10-14 20:43:29 +00:00
7596ceeebd
these are important for when you are running with debug off
2011-10-14 20:38:09 +00: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
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
548c48d03a
added logic to determine wishlist and backing status info for profile
2011-10-14 09:49:52 -04:00
a3de52e5f9
wiring live data into the css
2011-10-14 09:49:27 -04:00
6d51c521af
add/remove functionality and alternate row styling
2011-10-14 09:44:23 -04:00
97e630c196
removed tabs
2011-10-14 05:29:23 +00:00
2c1b4ed8ad
added ability to add books from someone elses wishlist
2011-10-14 05:23:46 +00:00
7057887bf0
s/tweeter/twitter/
2011-10-14 05:09:34 +00:00
be66e3372e
put remove from wishlist back
2011-10-14 01:05:19 -04:00
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
ff5aea310c
removed tabs
2011-10-13 22:19:14 -04:00
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
ad9bad997e
Display total current pledge/authorization in campaign_detail
2011-10-13 14:40:07 -07:00
319906774c
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
2011-10-13 14:25:51 -07:00
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
c0bd998732
First attempt to write out transactions associated with Campaign
2011-10-13 10:28:23 -07:00
da3b41af9d
fixing date format
2011-10-13 12:55:44 -04:00
206b722c5d
Added logic to generate backed/backing/wished data for badge display
2011-10-13 12:23:57 -04:00
62c1773090
incorporating latest round of supporter page css
2011-10-13 12:23:16 -04:00
f01d0c4df3
First cut at doing payment integration and understanding how to use class-based generic views
2011-10-12 10:47:48 -07:00
7e4f0a222b
Ooops....forgot some files in previous commit
2011-10-11 10:03:40 -07:00
39037c3ec6
Current status: ugly first cut integration
2011-10-11 10:02:17 -07:00
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
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
4e65134ab1
no need for commented out imports, eh
2011-10-09 15:17:43 -04:00
5f411e49e0
converting css to a less system to improve maintainability. see http://lesscss.org/
2011-10-04 16:18:59 -04:00
406a15e8b6
minor fix to footer
2011-10-03 14:51:31 -04:00
558ed5a8e5
merged changes to base.html
2011-10-03 12:52:52 -04:00
d652c2ac06
added rightsholder tools link
2011-10-03 12:51:30 -04:00
1acc2a6af8
adding rightsholder tools link to footer
2011-10-03 13:50:34 -03:00
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
ce080f893e
Merge branch 'master' of github.com:Gluejar/regluit
2011-09-30 01:01:33 +00:00
dea578e019
bugfix for https://www.pivotaltracker.com/story/show/19054387
2011-09-30 01:01:28 +00:00
1fe7bf3dc9
Merge branch 'master' of https://github.com/Gluejar/regluit
2011-09-29 19:32:23 -04:00
459ffbc549
Revert "quote style"
...
This reverts commit 88abca0b33
2011-09-29 19:32:14 -04:00
88abca0b33
quote style
2011-09-29 19:28:16 -04:00
146bb5639f
resolving errors raised by django registration tests
2011-09-29 19:27:31 -04:00
d653277da6
no longer needed since this is inline in supporter.html and search.html
2011-09-29 16:44:38 +00:00
3f1eae3105
remove from wishlist functionality
2011-09-29 16:42:19 +00:00
9a44cfc436
added remove from wishlist
2011-09-29 11:44:03 +00:00
dde1253dea
removed print statements
2011-09-29 02:30:13 -04:00
5f43f87169
make on wishlist message the same
2011-09-29 02:28:10 -04:00
409df080ce
got search passably working and a somewhat functional ajax add to list
2011-09-29 02:23:50 -04:00
41746e6063
added login form on the activation complete page
...
moved login form code to a separate template (DRY), which required
changing the view for activation_complete
2011-09-28 23:26:08 -04:00
32ec8bd119
removed tabs
2011-09-28 22:02:33 -04:00
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
65457dd921
merged
2011-09-29 01:42:08 +00:00
8a9f785c4e
started adding back some search functionality
2011-09-29 01:36:47 +00:00
45aef0e947
privacy policy updated with paypal info
2011-09-28 13:28:12 -04:00
433b853c05
removed tabs since they are evil
2011-09-27 09:45:03 +00:00
f8095e9513
added and used Campaign.cover_image_small
2011-09-27 09:27:47 +00:00
195f6db360
redirect to supporter page if logged in
2011-09-27 09:27:15 +00:00
b709cf3d61
clicking on unglue.it icon takes you home
2011-09-27 09:11:26 +00:00
df05fcf3b3
<title> needed a space after "unglue.it"
2011-09-26 15:43:41 -03:00
781b749005
Merge remote branch 'origin_team/master'
2011-09-21 11:17:13 -04:00
ac5e372131
new designs for home and supporter pages, take 1
2011-09-21 11:11:36 -04:00
85079fd559
removed facebook and twitter from django-socialauth login/registration
2011-09-18 19:45:23 -04:00
a8dffead58
privacy policy now displays in footer
2011-09-13 14:35:06 -04:00
5a6c267ab5
added urlpattern for privacy page
2011-09-13 14:59:29 -03:00
8998789116
added privacy policy
2011-09-13 10:55:11 -04:00
bb4003ecab
should have been supporter not contributor ...
2011-09-12 18:20:36 +00:00
ab3216f778
renamed user view to contributor, since that is what eric has been calling it
2011-09-12 15:23:33 +00:00
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
5d69a5818d
got title and author on back of panel
2011-09-12 13:10:50 +00:00
c7bd44cbca
typo
2011-09-12 13:04:32 +00:00
7720a73fb0
beginnings of a user wishlist display...
2011-09-12 01:53:54 -04:00
4352743f13
initial pass at pulling in stefan's book panel templates
2011-09-11 23:44:21 -04:00
826097609b
friendlier wording
2011-09-07 10:27:00 -03:00
f393210439
minor wording change
2011-09-07 10:26:19 -03:00
bbffab436b
removed redundant images subdirectory
2011-09-06 04:07:11 +00:00
8d7d1087f9
minor wording change
2011-09-06 04:02:15 +00:00
0ce0369792
small style changes, and signal to update email if available from facebook
2011-09-06 03:50:38 +00:00
9e98be5b37
added django-social-auth for logins w/ google, twitter and facebook
2011-09-05 21:04:49 -04:00
66dfa7f933
duplicate http://
2011-09-04 15:12:28 +00:00
b7ae2146c4
got the menu bar changing when a user is logged in again
2011-09-04 01:29:18 -04:00
98301544a8
removed gmail credentials and modified the installation to give instructions for creating a settings.me settings module where you can put your gmail credentials, which will not be put in git
2011-09-04 01:04:04 -04:00
6bd5824fc4
introduced django-registration for user management
2011-09-04 00:21:51 -04:00
139a866bf6
setup api, core and frontend apps, also added initial homepage template from stefan
2011-08-30 23:46:55 -04:00
83c5593d08
tweak all the css
2000-12-31 19:12:21 -05:00
eric
Andromeda Yelton
Ed Summers
Raymond Yee
thatandromeda