Commit Graph

341 Commits (111e10f380ce66af1760f8c4643db2b608a4066e)

Author SHA1 Message Date
eric 3d5ab78f3f exception handling to log openlibrary json failures and send user on to fallback 2012-03-10 11:03:58 -05:00
eric 3a70949f36 added handling for moved works to wishlist action 2012-03-09 16:05:01 -05:00
eric 87eee4ed9f add prefix to forms so html will validate [#26203269] 2012-03-09 13:00:16 -05:00
Raymond Yee a252f9d173 [#22561067] Implemented regluit.utils.localdatetime.now is by default datetime.datetime.now() (in Django 1.3) and django.utils.timezone.now() in Django 1.4+
One overrides regluit.utils.localdatetime._now to do "time travel" -- useful for testing scenarios requiring time changes (such as Campaigns)
Get rid of call references to datetime.datetime.now() or utcnow() and datetime.date.today() in favor of regluit.utils.localdatetime.now() and date_today().
2012-03-09 00:45:39 +00:00
Andromeda Yelton 2c1ceeaf22 merge all the things 2012-03-08 10:49:04 -05:00
Andromeda Yelton a3378efb17 factored the reused slideshow code from home and supporter into its own function 2012-03-08 09:36:59 -05:00
eric 142fe72f93 added db metrics page [deliver #26022545] /info/metrics.html 2012-03-07 22:07:01 -05:00
Andromeda Yelton cea2979ade oh harrumph jenkins, it worked locally 2012-03-07 14:24:05 -05:00
Andromeda Yelton 05860bfa06 foregrounding search and browse features when own wishlist is empty 2012-03-07 13:23:34 -05:00
Andromeda Yelton c9be954972 can now set default tab for ungluedlist, worklist, supporter in views.py. pagination remembers user tab, overrides default. 2012-03-02 09:40:10 -05:00
Andromeda Yelton 369d8c527e Merge branch 'master' of github.com:Gluejar/regluit 2012-03-01 09:27:27 -05:00
Andromeda Yelton b9e9f6f213 reconciling worklistview and supporter page querysets so they will both play nice with book_panel. adding some sorting to worklistview. 2012-03-01 09:11:35 -05:00
eric c43fe2fcb3 replaced python urllib with django.utils.http to handle url encoding of non-ascii 2012-03-01 08:53:55 -05:00
eric d6a04f66f2 fixed guery bugs noted by andromeda 2012-02-29 14:20:50 -05:00
eric 094f4e56ee fixed work_view tabbing 2012-02-29 13:15:38 -05:00
eric 5ce023d322 fixed unglued list tabbing 2012-02-29 12:34:21 -05:00
Andromeda Yelton cb06d2a36a merging 2012-02-29 08:57:24 -05:00
Andromeda Yelton 34fbeb805d moving unglued-but-not-ebooked back to Active tab, adjusting sorting of querysets in supporter page tabs, fixing active tab on list pages 2012-02-29 08:41:30 -05:00
eric eebeb2476f finish committing all changes 2012-02-28 17:28:58 -05:00
Andromeda Yelton 8d38579606 more logical sorting of supporter page book lists 2012-02-27 16:12:25 -05:00
Andromeda Yelton b55c53467d comments should show most recent first 2012-02-23 15:40:45 -05:00
Andromeda Yelton 477de72b77 clarifying what goes in each supporter tab and fixing interaction with pagination 2012-02-21 22:00:23 -05:00
Andromeda Yelton e97550bf5f adding support for contextual FAQs to pledge pages 2012-02-21 09:24:23 -05:00
eric 471cb62fd2 changed core.tasks to not use models 2012-02-16 13:19:36 -05:00
eric 7b6b1d067f userlist queries now only look at first 100 works 2012-02-11 19:08:05 -05:00
eric 41f41aa76e fixed NameError: global name 'Http404' is not defined 2012-02-11 15:14:31 -05:00
eric 107e6ffd0c apply migrations! added num_wishes on work model. "popular" page now 10x faster 2012-02-11 14:15:06 -05:00
eric 1a62f8634e missed this charge; only affects rights holder claims forms for redirected works 2012-02-10 19:30:09 -05:00
eric 07e578699d Added WasWork model to track deleted works. Apply migrations! 2012-02-09 22:30:33 -05:00
Ed Summers f55330365e added endless scroll for search results 2012-02-04 16:06:53 -08:00
Andromeda Yelton 8d17e2d0d6 tweak all the things 2012-02-03 12:05:02 -05:00
Andromeda Yelton 98e2189014 now there is a latest comments page 2012-02-03 10:22:53 -05:00
eric 3333c51bf3 fix name error for HttpResponseNotFound 2012-02-02 09:05:41 -05:00
Andromeda Yelton bc351e0895 Merge branch 'master' of github.com:Gluejar/regluit 2012-02-01 15:57:10 -05:00
Andromeda Yelton 03b58d14ca wished by n thing is now clickable and goes to supporter tab. also you can now specify the active tab on a work page with a get parameter. 2012-02-01 15:57:03 -05:00
Raymond Yee fb77d1a08d Resolve ambiguity in Work lists order -- sort by Work.id as a secondary sort key 2012-02-01 09:43:46 -08:00
Raymond Yee 268e188082 Clean up the debugging messages I had left in frontend.views.wishlist 2012-01-31 15:15:03 -08:00
Raymond Yee 2610be2c35 Need a distinct() to properly filter out duplicates for popular and new list 2012-01-31 15:07:40 -08:00
Raymond Yee 886233a68a Filter the popular and new lists to show only works that are on a wishlist
https://www.pivotaltracker.com/story/show/24232005
2012-01-31 14:56:34 -08:00
Raymond Yee 0924b0de9a Merge branch 'master' of github.com:Gluejar/regluit into ry
Conflicts:
	frontend/views.py
2012-01-31 12:12:39 -08:00
Raymond Yee 7e39492cd4 Debugging the wishlist functionality 2012-01-31 11:54:48 -08:00
eric aa1f99ee56 handle gb lookup errors in views 2012-01-31 10:08:43 -05:00
eric 76eb9a1760 detabbing?? 2012-01-31 10:07:52 -05:00
Andromeda Yelton 317c1d2901 adding user agent reporting to feedback form 2012-01-25 14:55:03 -05:00
Raymond Yee d255fa0335 Made change so that Goodreads API is hit only when supporter wants to load books: https://www.pivotaltracker.com/story/show/23590565
Also allow supporter to clear association with Goodreads account
2012-01-24 09:36:45 -08:00
Raymond Yee a1e944b795 A round of changes to speed up /list/popular 2012-01-20 16:35:13 -08:00
Raymond Yee 2a0c572211 First take at speeding up /unglued/recent 2012-01-20 15:35:37 -08:00
eric 7ecffddc9f fix some isbn issues, incl. bad Openlibrary link 2012-01-17 16:50:19 -05:00
eric c3dcd3d294 fixed issues with null pubdates 2012-01-16 23:28:34 -05:00
eric 7affe92c8d Merge branch 'generic_id' 2012-01-16 13:21:47 -05:00
Andromeda Yelton e94219fd0e improving data we get from our feedback form 2012-01-15 19:02:50 -05:00
Andromeda Yelton e34aba9be2 Merge branch 'master' of github.com:Gluejar/regluit 2012-01-15 18:12:04 -05:00
Andromeda Yelton d50e9471a4 preview site will now show most-wished, not campaigns ending soonest 2012-01-15 18:03:54 -05:00
eric 9eaa08bf71 added unglued lists 2012-01-15 16:48:36 -05:00
Raymond Yee 7a16029d72 Small bug in the feedback view: user -> request.user 2012-01-10 17:21:37 -08:00
Raymond Yee 54f2411ab9 Put in a basic page for a pledge completion. 2012-01-10 17:15:39 -08:00
Raymond Yee 01f5664bf5 Some very basic functionality associated with cancel_url, including the ability to try again on the pledge. 2012-01-10 15:26:04 -08:00
eric d7e5e6e1ed Merge branch 'master' into generic_id 2012-01-10 15:40:15 -05:00
eric 0d19018e62 api tests working; non-google id's working 2012-01-10 15:20:02 -05:00
Raymond Yee 3abd29f225 First pass at passing in campaign id into cancel_url (which is now calculated in payment/manager.py) 2012-01-10 12:16:04 -08:00
Andromeda Yelton 95f32400ec Merge branch 'master' of github.com:Gluejar/regluit 2012-01-09 16:13:49 -05:00
Andromeda Yelton 556ecf8a06 now users can give us feedback on alpha 2012-01-09 15:53:09 -05:00
eric 0b91017dd5 Did what edso told me not to do- re-architected db to use generic ids 2012-01-09 13:55:22 -05:00
Raymond Yee a4957a5bf6 Merge branch 'master' of github.com:Gluejar/regluit 2012-01-09 12:47:51 -05:00
Andromeda Yelton a7009b1998 whoops, should probably commit the version that passes tests 2012-01-09 12:44:35 -05:00
Raymond Yee 2d1ab0dba6 Merge branch 'master' of github.com:Gluejar/regluit 2012-01-09 12:40:03 -05:00
Raymond Yee a174b3eb93 Putting in skeleton for pledge cancel and complete PayPal callbacks 2012-01-09 12:36:03 -05:00
Andromeda Yelton a9fc98b771 work page now displays a modify-pledge button where appropriate. not yet wired to modification functionality. 2012-01-09 11:50:48 -05:00
Andromeda Yelton 8460fba0bb organizing the FAQ 2012-01-06 10:42:17 -05:00
Raymond Yee 68f0c255d5 Force login on PledgeView as a whole 2012-01-04 12:03:50 -05:00
Andromeda Yelton 7de1051448 it is not unlike a sidebar organizing the FAQs 2012-01-03 16:17:04 -05:00
eric 739fccbe83 roemoved vestigial code from search view 2012-01-02 19:08:23 -05:00
Andromeda Yelton 30703cdabc Merge branch 'master' of github.com:Gluejar/regluit 2012-01-02 09:41:16 -05:00
Andromeda Yelton 03d94bfbc5 tweaking email sharing 2012-01-02 09:39:11 -05:00
eric 1cad25da28 detab source file 2011-12-31 13:49:23 -05:00
eric 9d6066c929 catch IndexErrors to fix HermanCain bug; there is a work with zero editions 2011-12-31 13:48:54 -05:00
Andromeda Yelton 0550f9ac43 added some default field prepopulation to email share form 2011-12-29 10:40:35 -05:00
Andromeda Yelton 79bc9ac15a now email share has marginal styling and returns users to their original page after form submission 2011-12-28 23:17:39 -05:00
Andromeda Yelton 0717479238 lo-fi email sharing now works 2011-12-28 20:43:52 -05:00
Andromeda Yelton 97ee0a7fc4 shortened publication date in work page header, made book list cover clickable 2011-12-28 07:27:56 -05:00
Andromeda Yelton f0e1d47ac4 remove this button on work page returns page to add-to-wishlist state 2011-12-27 21:39:40 -05:00
Andromeda Yelton a35ffb2ffa Merge branch 'master' of github.com:Gluejar/regluit 2011-12-26 12:53:36 -05:00
Andromeda Yelton c79b3bdd10 replaced useless status indicators with wished-by indicators on supporter page for status = initailized or no campaign and destroyed GR/LT modal dialog 2011-12-26 12:53:28 -05:00
Raymond Yee c721c9c6b2 Now in campaign admin, you can pick specific campaign to take action on. 2011-12-23 09:59:07 -05:00
Raymond Yee a757f6f99b Versions that include movement to utcnow() and changing what comes out PaymentManager.checkStatus() -- but payment to primary recipient is now broken. Need to investigate 2011-12-22 20:34:24 -05:00
Andromeda Yelton 6f64434b4e Merge branch 'master' of github.com:Gluejar/regluit 2011-12-22 09:51:59 -05:00
Andromeda Yelton 7130ee5625 progress icon replaced by wished-by-N text for books on supporter page with no campaign yet 2011-12-22 09:51:49 -05:00
Raymond Yee 17d4acceab changed PaymentManager.cancel to PaymentManager.cancel_transaction and added PaymentManager.cancel_campaign to parallel other methods in PaymentManager
morphing the campaign_admin view towards being able to push all the campaigns through the various states
2011-12-21 17:32:08 -05:00
Raymond Yee 75fceed7c5 Now display the campaigns with three different types of transactions: ACTIVE, INCOMPLETE, COMPLETED on the campaign_admin view 2011-12-20 20:36:27 -05:00
Raymond Yee 4e36892910 Putting in stub for campaign_admin.
Let admin do a PaymentManger.checkStatus() to get the latest information about Transactions (using the PayPal PaymentDetails and PreapprovalDetails API methods)
2011-12-20 17:42:06 -05:00
Raymond Yee c055767173 set the expiry date based on the campaign deadline. There is a setting PREAPPROVAL_PERIOD_AFTER_CAMPAIGN for specifying how many days after the campaign deadline should we ask for a preapproval deadline. I've put in 90 days. 2011-12-20 14:56:01 -05:00
Raymond Yee aab7b6f926 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-20 10:35:42 -05:00
eric f81a4e8e6d removed isbn_10 column and fixed many isbn13 non-compliance issues
apply migrations!
2011-12-19 23:26:55 -05:00
Raymond Yee bad343e3d2 views.py: wiring in the email address of partnering non-profit
payment/manager.py: wire in the email address of the campaign recipient and the Gluejar commission rate
move the Gluejar commission rate to dev.py/prod.py
2011-12-19 18:34:30 -05:00
Ed Summers 55656e2d3d now getting subjects from openlibrary instead of from googlebooks. You will need to APPLY MIGRATIONS! 2011-12-19 01:33:13 -05:00
Andromeda Yelton 43c0dfa67d distributing image links to google across servers better 2011-12-13 14:49:41 -05:00
Ed Summers d08e939cc3 order editions in reverse chronological order 2011-12-12 21:44:35 -05:00
Andromeda Yelton 27e88e5458 Merge branch 'master' of github.com:Gluejar/regluit 2011-12-09 16:15:24 -05:00
Andromeda Yelton 66ebeaf07e links to edition-specific google books in detail view 2011-12-09 16:15:11 -05:00
Ed Summers 33532029c1 removing print statement (oops) 2011-12-09 13:23:28 -05:00
eric eca82b3911 wired recent events to landing page ungluers 2011-12-08 19:12:26 -05:00
eric 167dccf574 Wishlists are now filled using the Wishes intermediate table. It's named the same as previous intermediate table, and I've edited the migration so data is not lost.
Also, I've added methods od Wishlists to add and remove Works. There
are "source" and created columns on the Wishes table
2011-12-08 18:22:20 -05:00
Andromeda Yelton aa0a935d16 details tab displays editions 2011-12-08 16:23:31 -05:00
eric 5a8d7e8fa3 put a real query into landing page campaign slider 2011-12-08 08:10:58 -05:00
eric d00adef207 campaign searches now use the status field 2011-12-06 16:37:03 -05:00
Andromeda Yelton 3f8c6321c7 Merge github.com:Gluejar/regluit 2011-12-06 15:08:55 -05:00
Andromeda Yelton 2396a3ff69 now there are book panels on the landing page with real (albeit silly) data. hover state of panels not working yet. 2011-12-06 15:08:36 -05:00
Ed Summers 2adc23b380 when a lookup on openlibrary fails, fall back to doing a search 2011-12-06 09:53:53 -05:00
Ed Summers 411a254ee6 got librarything, goodreads and openlibrary links working when ids are available, with fallbacks to isbn routing and canned search urls 2011-12-05 00:56:24 -05:00
Ed Summers 97daddea5d Merge branch 'master' of github.com:Gluejar/regluit 2011-12-02 23:08:10 -05:00
Ed Summers 641e4904d9 link to googlebooks 2011-12-02 23:07:55 -05:00
eric e0fbb3d324 Added Ungluers and facet display to CampaignListView 2011-12-02 22:53:39 -05:00
eric 7f4976bde5 added ungluers to WorkListViews 2011-12-02 22:32:25 -05:00
eric 34dd5237af merged with raymond's commit 2011-12-02 19:37:27 -05:00
eric dd6add1e44 Implemented WorkListView- does popular and recommended lists 2011-12-02 19:29:23 -05:00
eric 87f07bd9c3 removed "closest" campaign list; added most pledges list and biggest campaign list 2011-12-01 17:32:53 -05:00
eric 68b0d4b73a implemented a generic view class for campaigns.
Ending and newest views are reverse sorted. campaign status is dealt
with except for successful campaigns
2011-12-01 13:17:33 -05:00
eric f094efdca2 removed superfluous "shared_works" code
this is more efficiently done by accessing request.user.wishlist in the
templates.
2011-12-01 08:47:58 -05:00
Raymond Yee b8cebfa0dd Refining the interaction of Premium choice and pledge amount 2011-11-30 08:58:26 -08:00
Raymond Yee b44379e6cd First pass at tying the premium selected and the pledge amount 2011-11-29 18:02:51 -08:00
eric 9cbcea0f72 the open campaign form now automatically sets the end date and target to allowed values 2011-11-28 23:37:31 -05:00
Raymond Yee 57640ec7b2 First pass at unwiring campaign_detail from the real pledge view. 2011-11-28 15:39:06 -08:00
eric f96b5e4637 fixed bug where anonymous user can't view work page 2011-11-26 17:09:33 -05:00
eric b398a948dc refactored campaign management savable constraints out of view and into form 2011-11-25 21:23:37 -05:00
eric d5bae40c00 refactored launchable into campaign model. fixed date camparison bug. moved target and deadline limits to settings file 2011-11-23 21:41:06 -05:00
Raymond Yee 83b006b2d3 Turning off embedded PayPal UI to see whether paypal redirect works properly on please 2011-11-23 13:14:39 -08:00
Raymond Yee 38d38ff844 I keep forgetting to import sys 2011-11-23 10:54:02 -08:00
Raymond Yee 0ec0416c0f Print out to stderr the PayPal URL 2011-11-23 10:50:29 -08:00
Andromeda Yelton 017fb9fac9 Merge branch 'master' of github.com:Gluejar/regluit 2011-11-23 12:29:15 -05:00
Andromeda Yelton 14a008421d refactored search.html to use book_panel.html. required altering labels of some data sources so that they have the same names when they hit book_panel regardless of where it's included from 2011-11-23 12:28:59 -05:00
eric 20cc607193 claim form now uses ModelChoiceField; tests for previous claims 2011-11-23 12:23:53 -05:00
Raymond Yee 4cfabf6efe Turning on embedded view to test 2011-11-22 14:17:54 -08:00
Raymond Yee 9b815e7e28 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-11-22 11:53:06 -08:00
Raymond Yee 979a403a06 Merge branch 'jkace' of github.com:Gluejar/regluit into payment
Conflicts:
	frontend/templates/campaign_detail.html
	frontend/views.py
2011-11-22 11:30:45 -08:00
Andromeda Yelton 47754ddd6c now you can get embed code from the work page 2011-11-22 14:28:27 -05:00
Raymond Yee 5f4496a290 Merge branch 'master' of github.com:Gluejar/regluit into campaign_widget 2011-11-22 06:45:07 -08:00
Jason 58eb67e0aa Adding code to support embedded payments 2011-11-22 06:14:58 -05:00
eric 0bad939bfb Though the form is ugly, a campaign manager can now launch a campaign and set info
I also learned what it means when a form is bound to a model object
2011-11-22 00:28:16 -05:00
Raymond Yee 78339e3de5 Added a rough textarea for someone to copy embedding iframe for widget 2011-11-21 18:06:44 -08:00
Ed Summers 8008a5df51 added /googlebooks/{googlebooks_id}/ route which will add the book to gluejar and redirect to the new work url, for use on the search results page 2011-11-21 20:12:13 -05:00
eric 6e5d51f24f is_staff, not is_staff() 2011-11-21 15:08:28 -05:00
Andromeda Yelton 495f447b1a now the supporters tab on the work page is populated 2011-11-21 13:06:23 -05:00
Andromeda Yelton 44e14ab2a8 pushed some logic into views so that work page will be making fewer db calls on net 2011-11-21 10:51:50 -05:00
eric 43d3f3f553 halfway through implementation of campaign management. can't launch campaigns yet. migrate schemas! 2011-11-20 22:23:51 -05:00
eric 1189ab02c4 switched to using is_staff set by django admin to determine website "staff" (also fixed a bug from last commit) 2011-11-20 14:22:51 -05:00
eric 497d883a43 fixed no results bug in gluejar-search; started passing remote IP address to google api 2011-11-20 09:20:08 -05:00
eric a6bf130b24 Andromeda von Rightsholder can now open campaigns from her rightsholder tools page; apply migrations! 2011-11-19 21:22:54 -05:00
eric e5eaf14ad0 prettied up logins. fixed not-logged-in on admin bug. provided path to password reset for social auth users 2011-11-18 19:50:47 -05:00
Ed Summers 6a9a213632 added pagination with django-endless-pagination 2011-11-17 23:09:23 -05:00
eric a720089525 unglue it admin users can now approve rightsholder claims! 2011-11-17 14:35:41 -05:00