EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,386 Commits
41 Branches
2 Tags
154 MiB
Commit Graph

669 Commits (a2329de3b1dafc70fce2e72742ae3fbb853342f6)

Author SHA1 Message Date
eric 389e01d1cc fixed out of order migrations. 2012-09-17 16:00:28 -04:00
Raymond Yee da2f1e0665 Merge branch 'master' into relaunch 2012-09-14 17:05:29 -07:00
Raymond Yee c5f22742c1 In making a stripe charge, record transaction.type and transaction.approved. 
Fixed Campaign.transactions() to handle default variables properly (compare with dfe17f94fa (L0R257) )
 2012-09-13 14:12:49 -07:00
eric 270b47ef62 the google books id is always the first in our db. changing to the id for preferred edition [#35918643] 2012-09-13 14:55:46 -04:00
Raymond Yee e6f94223f4 Merge branch 'master' into relaunch_ry 2012-09-11 15:55:58 -07:00
eric dc94a207cc [start #35862759] fixed bug in handle_wishlist_added 2012-09-11 14:06:46 -04:00
Raymond Yee 7f344c0ca9 dealing with merge conflicts 2012-09-10 14:27:14 -07:00
Raymond Yee deee2ab75a Merge branch 'master' into relaunch 
Conflicts:
	core/signals.py
	frontend/views.py
 2012-09-10 14:25:43 -07:00
Andromeda Yelton 7398fdf161 unglued property should adhere to editions, not ebooks 2012-09-10 15:18:40 -04:00
eric de9da54206 sorting the premiums turned out to be easy 2012-09-07 17:56:58 -04:00
eric 4700e63b06 resolve conflict 2012-09-07 16:26:09 -04:00
Raymond Yee 1742572d95 Merge branch 'master' into relaunch 
Conflicts:
	frontend/views.py
 2012-09-07 13:08:03 -07:00
eric 6f63c047ce DRY pub year code moved to work model 2012-09-07 16:07:47 -04:00
eric 0c9d71e4d6 introduce PledgeExtra data object to simplify method calls 2012-09-07 09:46:38 -04:00
eric eb185438b4 methods currently marked as classmethods are really staticmethods 2012-09-07 01:04:18 -04:00
Andromeda Yelton 49f36e659e whoops resolving merge 2012-08-31 13:47:31 -04:00
Andromeda Yelton f2e9559a3a beginning of a notification to RHs when someone wishlists their work 2012-08-31 13:47:01 -04:00
eric 94270f33c6 add in credi processing; overhaul the PledgeView forms and partition authorize fn in Manager 
also removed unused target, lists, ack-link,
 2012-08-31 03:16:04 -04:00
eric 7c4a2b94f0 documented up_or_down parameter on pledge_modified signal handler 2012-08-31 02:50:38 -04:00
eric 618eda4aa5 eliminate db skew between prod and relaunch 2012-08-31 02:49:04 -04:00
Andromeda Yelton 8c030df830 adding some tests for my recent commits hooray 2012-08-29 15:56:14 -04:00
Andromeda Yelton adef29f536 Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch 
Conflicts:
	core/signals.py
 2012-08-16 17:11:12 -04:00
Andromeda Yelton 28670ed01a building LOCKSS manifest page 2012-08-15 09:40:37 -04:00
Andromeda Yelton 291a2f5d67 need to know which ebook is the unglued one. migration needed 2012-08-15 09:39:58 -04:00
eric 10560fb36b merge credit into relaunch 2012-08-14 21:15:31 -04:00
Andromeda Yelton 69d85e6565 need a no-premium option. make sure to syncdb 2012-08-14 14:14:03 -04:00
eric 3d7cd7fdae management command to set active campaigns to UNSUCCESSFUL, trigger amazon notice 2012-08-09 09:47:10 -04:00
Andromeda Yelton 3d112d16d3 need to define signal before using it 2012-08-08 15:02:12 -04:00
Andromeda Yelton 3fdc3a3f22 Merge branch 'master' of github.com:Gluejar/regluit 2012-08-08 14:43:50 -04:00
Andromeda Yelton e07f8487ee added signal receiver to send notifications in re amazon-shutdown campaigns 2012-08-08 14:22:33 -04:00
eric 5362c202bb added management command to create credits, balance notification [#21784207] 2012-08-07 14:12:50 -04:00
eric c36e49e42d set up badges back end [#29340547] 2012-08-06 22:34:20 -04:00
Andromeda Yelton da0f4970c2 improving data flow of acks throughout system 2012-08-06 15:44:43 -04:00
Andromeda Yelton 8db1e5b59a set up acks page to deal with ack_name, _link, _dedication and anonymity bit 2012-08-06 13:35:29 -04:00
eric 3bdde8f936 finally I understand how reclustering should work 2012-08-05 18:30:13 -04:00
eric cbb40f5511 added a safer relate editions method which won't cause big clusters to merge 2012-08-05 13:05:35 -04:00
eric 05767741d6 take extra care for null works 2012-08-05 13:03:37 -04:00
eric 48d54fdc39 management command to list works with no isbn 2012-08-03 14:42:02 -04:00
eric 2f109bef47 add email export management command 2012-08-03 11:16:47 -04:00
eric 05eb26d2cb use correct syntax for exception lists 2012-08-02 22:36:11 -04:00
eric 04335be3aa add a title filtering parameter to relookup_isbns 2012-08-02 20:44:08 -04:00
eric c0af96784b catch the exception that really occurs when there's no isbn 2012-08-02 18:35:52 -04:00
eric 1c4c0b0958 fix google all of a sudden throwing ip geolocation errors 2012-07-31 16:06:11 -04:00
Raymond Yee e76f30ed28 Lowering expected editiion and subject count for bookloader.add_by_googlebooks_id('c_dBPgAACAAJ') in the test 2012-07-30 08:23:38 -07:00
Raymond Yee aeda28bae5 Add handling for anonymity and overriding of username in acks 2012-07-30 08:05:02 -07:00
eric 184dfedda9 added override of one month OL cache [#33377581] 2012-07-27 15:58:53 -04:00
eric e8bd5ab2dc added ckeditor to manage campaign forms to provide rich text editing and image uploads [#32447975] 2012-07-27 14:23:44 -04:00
Raymond Yee e7d2589b77 updated output script for OLA 2012-07-27 09:01:04 -07:00
eric 63a8113414 management command to fix openlibrary descriptions delivered as dicts [finish #33377581] 2012-07-26 13:39:46 -04:00
eric 12671ddcdf unpack openlibrary descriptions delivered as dicts [#33377581] 2012-07-26 12:07:16 -04:00
Raymond Yee 495ad32122 Updated output of A-D for OLA acks 2012-07-25 16:18:39 -07:00
Raymond Yee 7f6b1fd684 refining script to produce data for OLA 
add user profile tagline to acks
 2012-07-25 07:15:51 -07:00
Raymond Yee abd07ec9ae a bit more documentation on how the OLA premiums break down 2012-07-23 09:40:43 -07:00
Raymond Yee ac845b0f06 Merge branch 'master' into ola_fulfill 2012-07-23 07:23:35 -07:00
Raymond Yee 0c0b807385 Adjusting number of editions required from at least 20 to at least 15 for test to pass (latest count 18) 2012-07-23 07:22:14 -07:00
Raymond Yee 685cc36234 Now printing out a lot of info for each supporter 2012-07-20 18:45:11 -07:00
Raymond Yee 08e18bbcd3 Merge branch 'master' into ola_fulfill 2012-07-20 10:18:24 -07:00
Raymond Yee 6c7e9594c0 [#33125113] Marking the language test for Cat's Eye as expected failure because I think Google has bad data for this work. 
Worth looking at other books
 2012-07-20 09:28:14 -07:00
Raymond Yee 9a985176bc Fixed problems in tests stemming from an edition of Neuromancer no longer in Google Books -- switched to another one 
We still have issues about language of editions for Cat's Cradle
 2012-07-20 08:40:11 -07:00
Raymond Yee 0765e6801d Now working on breaking down specific material and acknowledgement premiums for OLA 2012-07-19 16:06:28 -07:00
Raymond Yee 172e77bb6f First draft of a management command to hlep prototype how we are going to gather premium choices for OLA 2012-07-19 11:02:39 -07:00
Raymond Yee f7e49edfcb Continuing work on collecting info for OLA pledges 2012-07-18 10:49:25 -07:00
Andromeda Yelton 362a4d2b85 Merge branch 'master' of github.com:Gluejar/regluit 2012-07-16 14:52:38 -04:00
Raymond Yee 94384fcb59 Work in progress 2012-07-11 19:51:36 -07:00
Raymond Yee 7a76a2cbaf Merge branch 'master' into ola_fulfill 2012-07-10 14:15:28 -07:00
eric ccef6ba411 again [start #32488017] 2012-07-10 16:06:57 -04:00
eric 15ea12534a [#32488017] merge conflicts 2012-07-10 16:03:36 -04:00
eric f2a1bac760 [start #32488017] added some logging of send_mail task 2012-07-10 15:57:44 -04:00
Raymond Yee c8f0143630 Merge branch 'master' into ola_fulfill 2012-07-09 14:04:21 -07:00
Raymond Yee a5d0ef36d7 Merge branch 'feedback' 2012-07-09 10:09:59 -07:00
Raymond Yee 2f49651466 Force the from_email to be settings.DEFAULT_FROM_EMAIL unless you really want your from_email 2012-07-09 10:08:49 -07:00
Raymond Yee d869431b43 a first pass at getting a model for getting premium feedback for the OLA campaign 2012-07-09 09:28:50 -07:00
Andromeda Yelton dcee8182bf restricting displayed ungluers to those with nonempty wishlists 2012-07-09 10:53:44 -04:00
eric e2962e1075 [finish #30516251] supporter acknowledgement page basic version 2012-07-07 18:13:05 -04:00
eric 21e3cb582d fix tabs 2012-07-07 18:12:54 -04:00
eric 1764cd62d6 small optimization of supporter count 2012-07-07 16:38:23 -04:00
Andromeda Yelton 85247c306e Merge branch 'master' of github.com:Gluejar/regluit 
Conflicts:
	core/models.py
 2012-07-05 10:21:08 -04:00
Andromeda Yelton 0329976165 send signal for unsuccessful campaign notifications 2012-07-05 10:04:27 -04:00
Raymond Yee 5e3cf5d7aa Latest integration of campaign data in our own db plus the spreadsheet you can download from Amazon payments 
to produce CVS file
 2012-07-03 07:46:42 -07:00
Raymond Yee 5b733d214c setting up to automate daily campaign status update 2012-06-29 18:05:14 -07:00
Raymond Yee 9ac4aa26bd hook the unsuccessful_campaign to the right notice 2012-06-29 09:52:06 -07:00
Andromeda Yelton 8fbc65a305 merge 2012-06-28 14:31:48 -07:00
Andromeda Yelton de929363e5 we are going to need an unsuccessful campaign signal asap, sadly 2012-06-28 14:07:33 -07:00
Raymond Yee d3da49cf74 Stepping stone to correlating payments with Amazon data 
print 1 email / line
 2012-06-26 19:36:14 -07:00
eric dfe17f94fa [finish #31637107] refactored transaction summary code, now considers pending and other transactions 2012-06-21 23:20:58 -04:00
eric 0a259165a1 [fix #31498847] the helrond bug 2012-06-21 23:20:57 -04:00
eric e9e9ee135b expect the test to succeed again 2012-06-21 23:20:57 -04:00
eric cb9eb1e24e detab code 2012-06-21 23:20:57 -04:00
Raymond Yee d37792c813 [#31605173] This plugs .../pledge/work_id where work_id tied to no campaign or a campaign that is not ACTIVE 2012-06-21 10:16:51 -07:00
Raymond Yee e3ec5ba1ee don't return empty rightsholder for campaign if it's SUCCESSFUL. 
Remaining question:  why does the RH for a campaign depend at all on campaign status?  If it doesn't, we should remove dependence
 2012-06-21 07:36:44 -07:00
Raymond Yee 3988335072 Add a command to list queued notices 2012-06-21 05:18:12 -07:00
Raymond Yee 6389c25f11 Trying to import successful_campaign differently 2012-06-20 21:09:05 -07:00
Raymond Yee ea4fc308a0 Allowing campaign.update_status to go SUCCESSFUL w/o regard to specific deadline. 
Set a bookloader test to expected failure while it might be a transient error
 2012-06-20 15:48:55 -07:00
Raymond Yee 1f77371b7b 1) the title of ISBN:9780226032030 changed from 'Forbidden journeys' to 'Forbidden Journeys' 
2) using humanize tag naturalday on the book panel
 2012-06-18 13:55:45 -07:00
Raymond Yee 457aba97bd Merge branch 'master' into fps 2012-06-13 14:43:24 -04:00
Andromeda Yelton 2241134e92 comment notifications should contain link to comments tab 2012-06-13 08:52:53 -03:00
Raymond Yee c745452b4f Merge branch 'master' into fps 2012-06-11 11:44:19 -04:00
eric ed92de66be default premium description in fixture was different from TOS: username, not name to be used in acknowledgements 2012-06-11 11:39:25 -04:00
Raymond Yee 3d07e09424 Merge branch 'master' into fps 
Conflicts:
	payment/manager.py
 2012-06-08 15:02:57 -04:00
Jason d029e02bb4 Adding skeleton row locking code for demo 2012-06-01 12:20:17 -04:00
Andromeda Yelton 79bdcf3f5c commenting 2012-05-29 21:16:01 -04:00
Andromeda Yelton 1c5264d8a1 removing reference to payment_processor context variable, made irrelevant now that we have transaction.host 2012-05-29 21:01:17 -04:00
Andromeda Yelton 48481bd819 improving ple pledge_modified 2012-05-29 20:50:53 -04:00
Raymond Yee fccedc50d7 Goodreads problem has been fixed: http://www.goodreads.com/topic/show/908732?utm_medium=email&utm_source=comment_instant#comment_51301819 2012-05-29 16:23:57 -07:00
Raymond Yee 52ed00b80b Marking core.GoodreadsTest.test_review_list_unauth as expected failure for now. I believe there is a problem on 
the Goodreads side and have reported the problem:  http://www.goodreads.com/topic/show/908732-api-problem-http-status-code-500-for-list-xml#comment_51296303

I will need to turn this test back on once Goodreads fixes the problem
 2012-05-29 15:27:54 -07:00
Raymond Yee 8ce6ffe530 Pull which payment processor is involved from the transaction itself not from the settings.PAYMENT_PROCESSOR 2012-05-29 15:01:48 -07:00
Raymond Yee 111e10f380 Expose what http code we are getting from goodreads when we get something that is not 200 2012-05-29 12:47:38 -07:00
eric 4e81f743b4 removed import loop 2012-05-29 12:08:28 -04:00
Andromeda Yelton a8762dca73 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-29 08:55:36 -04:00
Andromeda Yelton 2563dda3e5 creating signal for pledge_modified and moving you_have_pledged to signals framework so they interact properly -- at most one sent 2012-05-29 08:54:57 -04:00
eric bafeb92bdd [#29809805] fixed email dedupe email at account activate fails when more than one prior account 2012-05-26 17:27:10 -04:00
Raymond Yee a2514eb99c Got rid of small typo in wishlist_unglued_book_released notice type description 2012-05-25 13:49:45 -07:00
eric 1bb459e71d resolve test conficts 2012-05-25 14:54:08 -04:00
eric 8ca9b7900c [start #28494261] "official" notification get sent by email too wishers by default. needs syncdb 2012-05-25 14:52:50 -04:00
eric 4ec7fef25c log adding book only if it's new to the database 2012-05-25 13:13:15 -04:00
eshellman b3610e17f3 added hard updates of campaign objects 2012-05-25 13:52:25 -03:00
eshellman a77d2e3fea The campaign setup for test_merge_works was wrong but fixing it causes the test to fail on my machine and I cannot fathom why. Fixing it directly on github to make sure I haven't done something else stupid. 2012-05-25 13:03:23 -03:00
Andromeda Yelton a830d5af48 eric wanted me to write a test so I did. tests percent_of_goal 2012-05-22 11:07:05 -04:00
eric c61bc9985d test for factored license url [#29884981] 2012-05-20 00:12:16 -04:00
eric f72796acdf factor license URL and badge into one class [#29884981] 2012-05-20 00:10:56 -04:00
eric 61ec9db6a2 tab->spaces 2012-05-20 00:06:04 -04:00
Andromeda Yelton 085b67fb93 making sure not to run into int/float mismatch problems, and also it's ok if the percent goes over 100 2012-05-17 14:51:53 -04:00
Andromeda Yelton d94b23e2fe wow so calculating percents totally works better when you multiply by one hundred huh 2012-05-17 14:47:32 -04:00
eric 23b8ec4987 redeleteing UNGLUEIT_SHORTEST_DEADLINE 2012-05-17 11:36:15 -04:00
Andromeda Yelton 20a99412ab streamlining percent_of_goal 2012-05-17 09:24:37 -04:00
Raymond Yee 57d74ecea1 Added: 
from regluit.payment.parameters import TRANSACTION_STATUS_ACTIVE
 2012-05-16 08:18:04 -07:00
Raymond Yee bd66c62842 tell Jenkins about setting.PAYMENT_PROCESSOR (while we transition to having code look up transaction.host) 
add missing comma
 2012-05-16 07:47:16 -07:00
Andromeda Yelton b9de19bb09 modifying pledge_charged to only send transaction as context, and templates derive campaign and work info therefrom 2012-05-16 10:35:58 -04:00
Andromeda Yelton 2bf67671ad supporters should only return people with active transactions, not e.g. canceled ones 2012-05-16 10:24:03 -04:00
Andromeda Yelton 775d1d4af2 fixing rendering of successful campaign notifications 2012-05-16 10:06:26 -04:00
eric 8fd4edbe42 wired pledged_charged notice [finish #28493739] 2012-05-15 22:47:57 -04:00
Andromeda Yelton 6c3c1a8cd5 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-15 15:44:54 -04:00
Andromeda Yelton 8cba752057 more notices need html templates for display at /notifications 2012-05-15 10:27:57 -04:00
Raymond Yee d56b7a6453 First pass at a django admin command to check integrity of payments 2012-05-15 07:23:02 -07:00
eric d9a96c2ada putting from email in reply-to: header [#29498563] 2012-05-13 16:38:58 -04:00
Andromeda Yelton e6467e4e85 even moar wordsmithing of notifications 2012-05-12 21:49:31 -04:00
Andromeda Yelton 33f7c99a5b added a campaign.rightsholder property to make it not annoying to put rh names into templates 2012-05-12 21:49:18 -04:00
Andromeda Yelton 6fe7aeeabb even more notification wordsmithing 2012-05-12 21:28:27 -04:00
Andromeda Yelton 54e1e3e98b merge all the things 2012-05-12 12:25:17 -04:00
Andromeda Yelton 83730badbb more wordsmithing 2012-05-12 11:58:33 -04:00
eric a30976373f better default cover for works with no google id [#29488053] 2012-05-11 22:46:03 -04:00
Andromeda Yelton 70a1da6713 note comments at end about context needed for notification templates 2012-05-11 21:36:08 -04:00
Andromeda Yelton 4c7fef1ce5 typo was bugging me 2012-05-11 21:35:52 -04:00
eric 81d158f505 [#28851641] Edition creation and editing !!! Needs a schema migration. 2012-05-11 14:13:09 -04:00
eric 0f1bfaebc4 [finish #29411521] added site to url 2012-05-10 17:13:09 -04:00
Raymond Yee 33642190cb Allows set_key command to set keys that already exists 2012-05-10 08:34:45 -07:00
Raymond Yee 40a660e9b6 Add a set_key django admin command to make it easier to load keys 2012-05-09 17:17:18 -07:00
Raymond Yee 4deae23fd4 Ooops -- I forgot one migration 2012-05-09 11:42:29 -07:00
eric 0212136a43 Revert "unrequiring paypal address" 
This reverts commit 32a4b29e33.
 2012-05-09 09:37:57 -04:00
Raymond Yee 8a8f82a9a9 [#29272807] Forgot to make core.models.Key.name unique 2012-05-08 16:47:07 -07:00