Commit Graph

2699 Commits (4ff6e3316150bb390c34e2a5ecc1aad0805b9c15)

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