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

4076 Commits (30f7f2c4ba0fa353a62f6cc091bee90187370abf)

Author SHA1 Message Date
Raymond Yee aa20d6e0af Merge branch 'master' into expiring_cc 2013-07-19 19:15:10 -07:00
Raymond Yee 7c013ef93b Merge pull request #190 from Gluejar/instant_charge 
Instant charge:  implementing PaymentManager.charge
 2013-07-19 16:12:03 -07:00
Andromeda Yelton 8285af8611 maybe we should actually provide the URL 2013-07-19 15:39:55 -04:00
Andromeda Yelton f18fc27f91 Merge branch 'marc_provision' of github.com:Gluejar/regluit into marc_provision 2013-07-19 15:34:53 -04:00
eric 1bebec42af what about public domain ebooks? 2013-07-19 13:13:53 -04:00
eric 4c62a2b555 catch bad file errors 2013-07-19 12:47:36 -04:00
Andromeda Yelton 9cb3dcdadf documenting how you get MARCXML from LOC 2013-07-19 09:56:47 -04:00
Raymond Yee 4fc449dad5 Issue: instead of updating all Accounts in core.tasks.update_account_status -- updating only Accounts with expiration dates this month or earlier. 
Possible to make this even more narrow -- see https://www.evernote.com/shard/s1/sh/35adfc05-46cc-41b7-865e-8a0edb652fd0/a18917c04c0262cd624208b7a071ec52
 2013-07-18 16:14:01 -07:00
Andromeda Yelton 293b9b9db5 Merge branch 'master' into marc_provision 2013-07-18 16:39:33 -04:00
Andromeda Yelton 516c8c768a I can harvest files from the db instead of tempting error by entering them twice 2013-07-18 16:36:01 -04:00
Andromeda Yelton c3349ef5eb logging 2013-07-18 16:07:24 -04:00
Andromeda Yelton 0e143b15ba persist information about where to find AWS files 2013-07-18 15:49:54 -04:00
Raymond Yee 37ce78fda2 Merge branch 'master' into expiring_cc 2013-07-17 18:12:30 -07:00
Andromeda Yelton 54e422e217 parametrizing formats and license choices, bugfixing 2013-07-17 13:03:35 -04:00
Andromeda Yelton 87c27cecee wiring ungluify_record to front end and s3 2013-07-17 10:34:01 -04:00
Raymond Yee 635c25ea48 Merge pull request #192 from Gluejar/fix_test_merge_works 
[Finishes  #53514857] Change ISBNS of test editions to fix problem in  regluit.core.BookLoaderTests.test_merge_works
 2013-07-16 16:15:43 -07:00
Raymond Yee a6f9e524e1 [Finishes #53514857] Change ISBNS of test editions 2013-07-16 16:08:20 -07:00
Andromeda Yelton 8e2d469bb5 see if we can fix this 2013-07-16 11:45:31 -04:00
Andromeda Yelton e5a907644c Merge branch 'master' into marc_provision 2013-07-16 11:43:28 -04:00
Andromeda Yelton fe2e3b72c5 argh 2013-07-16 11:42:17 -04:00
Raymond Yee dabaa2f843 update tests to account for new events (now stripe allows multiple cards/customer and now generates card related events in addition to customer events) 2013-07-15 14:52:29 -07:00
Andromeda Yelton e3b6288e23 iterating unglify script, starting to integrate into front end 2013-07-15 16:35:41 -04:00
Andromeda Yelton 5f10047691 clarifying 2013-07-15 08:38:20 -04:00
Raymond Yee e4ab0ccd61 Merge branch 'instant_charge' into expiring_cc 2013-07-09 14:46:06 -07:00
Raymond Yee 8b0398aefc get rid of output cells in expiring_stripe_cc.ipynb and generate expiring_stripe_cc.py also. 2013-07-09 14:43:50 -07:00
Raymond Yee 030496a5a3 Merge branch 'master' into instant_charge 2013-07-09 14:09:59 -07:00
thatandromeda 30b3364e56 Delete .gitignore~ 2013-07-09 15:14:52 -04:00
Andromeda Yelton bbeb086cbc bugfixing 2013-07-08 15:54:36 -04:00
Raymond Yee 46d1d4f767 Merge branch 'master' into expiring_cc 
Conflicts:
	payment/models.py
	payment/tests.py
 2013-07-08 10:52:44 -07:00
Andromeda Yelton 1e1a0eda46 MARC record support in admin site 2013-07-08 11:14:25 -04:00
Andromeda Yelton 214467e8f1 display available MARC records 2013-07-08 11:14:09 -04:00
Andromeda Yelton 2ea00389b3 minimal MARC support in database 2013-07-08 10:03:22 -04:00
Raymond Yee f9c87e08a4 Merge pull request #191 from Gluejar/fix_send_to_kindle 
Fix send to kindle
 2013-07-05 07:27:21 -07:00
Andromeda Yelton 6e853fc8f9 exclude google books, align error message with page text 2013-07-05 09:05:26 -04:00
Andromeda Yelton 8ff9bfc52f filesize under Amazon SES 10MB limit 2013-07-05 08:43:02 -04:00
Raymond Yee c3544955b0 Merge branch 'master' into instant_charge 2013-07-02 11:24:59 -07:00
Raymond Yee 0788dee930 Merge pull request #189 from Gluejar/use_google_books_api_key 
Adding Google books api key to the search
 2013-07-02 08:04:59 -07:00
Raymond Yee ac6f57fb31 Adding Google books api key to the search 2013-07-02 08:00:01 -07:00
Raymond Yee d753d4bfa3 Merge pull request #188 from Gluejar/google_books_search 
Trying a new key for prod.py too to see whether that will fix breakage i...
 2013-07-02 07:43:02 -07:00
Raymond Yee 63a3bac876 Trying a new key for prod.py too to see whether that will fix breakage in api calls 2013-07-02 07:37:12 -07:00
Raymond Yee 4333a480de Testing out new Google Books API key on just 2013-07-02 07:24:18 -07:00
eric c88e002ccb get manage campaign to work a second time 2013-07-01 03:20:58 -04:00
eric 7eeb114d03 tweek status messages 2013-06-29 23:14:33 -04:00
Raymond Yee ccbc78a10c added a first pass for payment.tests.TransactionTest.test_paymentmanager_charge to illustrate use of PaymentManager.charge() -> hardwired for stripelib right now.... 2013-06-28 16:05:19 -07:00
Raymond Yee 172ed2f557 Merge branch 'master' into instant_charge 2013-06-28 14:10:50 -07:00
eshellman 5417f3b7d2 Merge pull request #187 from Gluejar/send_to_kindle_size_patch 
patch to limit attempts to send to kindle files that are on the order of...
 2013-06-27 14:19:51 -07:00
Raymond Yee 9205dd6f3d patch to limit attempts to send to kindle files that are on the order of the size of OLA --> Amazon SES has 10 MB limit 2013-06-27 14:14:54 -07:00
Raymond Yee 221a4bbfd2 Merge pull request #186 from Gluejar/fix_worklist_ordering 
remove conflicting "order by"
 2013-06-27 13:22:21 -07:00
eric 2a7a42fbfe Merge branch 'master' into ebook_selling 
Resolved Conflicts:
	frontend/templates/download.html
	frontend/views.py
	static/css/enhanced_download.css
	static/css/enhanced_download_ie.css
	static/css/sitewide4.css
	static/js/download_page.js
	static/less/enhanced_download.less
	static/less/enhanced_download_ie.less
	static/less/sitewide4.less
 2013-06-27 15:26:04 -04:00
eric b0f4eda221 show offers on work page 2013-06-27 13:10:33 -04:00