Commit Graph

3731 Commits (214467e8f1a824bdb22609863535fc3930ad280f)

Author SHA1 Message Date
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 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
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 98ba975eec remove conflicting "order by" 2013-06-27 12:00:47 -04:00
Raymond Yee 253735f03f Merge pull request #185 from Gluejar/simpler_download
don't pop a param that isn't there
2013-06-27 07:37:16 -07:00
eric 51c86867a0 don't pop a param that isn't there 2013-06-27 10:31:01 -04:00
eshellman 5a207bf4e8 Merge pull request #181 from Gluejar/simpler_download
Simpler download. Yay.
2013-06-26 11:39:39 -07:00
eric f2f02237a8 fix KeyError at source, not in test 2013-06-26 14:36:04 -04:00
Andromeda Yelton b063fe6c3f don't fail for spurious reason 2013-06-26 11:25:35 -04:00
Andromeda Yelton 14051e2f21 pop kindle email from session after use 2013-06-26 09:46:56 -04:00
Andromeda Yelton 02899d332f can has readmill logo 2013-06-26 09:46:47 -04:00
Andromeda Yelton a6879ac20d unbind send-to-kindle action after send, don't display options not available without javascript to non-js users 2013-06-26 09:43:15 -04:00
Andromeda Yelton 8395a4afb4 other things have logos, readmill should too 2013-06-26 09:31:26 -04:00
eric bb5bc2112d add readmill and send to kindle instructions 2013-06-25 17:42:06 -04:00
eric 6dd6d7de5a add instructions and png for embedded browser 2013-06-25 17:41:14 -04:00
eric e92532524f merge session.next_page into cookie.next functionality 2013-06-25 16:02:12 -04:00
eric fbe37359f2 simplify kindle_config view and add link to the work page 2013-06-25 16:01:08 -04:00
eric ff65b6b7dd validation nit 2013-06-25 15:59:00 -04:00
Raymond Yee bf516c96e8 Merge pull request #184 from Gluejar/new_stripe_version
dead pledge code cleaned up.
2013-06-25 11:25:03 -07:00
Raymond Yee cae7f6d862 also delete the commented out pledge method 2013-06-25 11:23:21 -07:00
Raymond Yee 22dc844b07 Getting rid of tests that call PaymentManager.pledge 2013-06-25 11:05:52 -07:00
eric f79c456f53 I don't like putting None in a dict, especially when it bloats the code 2013-06-25 01:35:09 -04:00
eric 3407b7cec4 add helpful link to response from send-to-kindle
also, move the kindle result messages into a template
2013-06-25 01:11:43 -04:00
eric e33077138f move ebook id to title attribute 2013-06-25 01:09:36 -04:00
Andromeda Yelton bcec6d4914 no smtp auth failures for you 2013-06-24 15:42:51 -04:00
Andromeda Yelton aa7e5bfe5e kindle instructions 2013-06-24 14:52:03 -04:00
Andromeda Yelton 50fce4bb1a sharing->email 2013-06-24 14:28:01 -04:00
Andromeda Yelton 1380040bd2 Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download 2013-06-24 13:56:39 -04:00
Andromeda Yelton 69f0451bea segregate flows of one-click and information-seeking options, address feedback 2013-06-24 13:53:28 -04:00
Raymond Yee 0950c3bc40 Merge branch 'master' into new_stripe_version 2013-06-24 09:18:31 -07:00
Raymond Yee 86caa9b3ed Making changes to fix breakage in core.tests.BookLoaderTests.test_add_by_isbn
2000-07-01 -> 2000
Ace Trade -> Penguin
2013-06-24 08:04:36 -07:00
Andromeda Yelton 3c950966bc Merge branch 'master' into simpler_download 2013-06-24 08:36:51 -04:00
Raymond Yee 53178d80ce moving to stripe 1.9.1 2013-06-21 15:14:51 -07:00
Raymond Yee 1c86a0ae5a I'm going to modify test for reflect readmill change -- it seems like there is no extra readmill button for test scenario 2013-06-20 14:17:47 -07:00
Raymond Yee a36ff38745 extraneous creation of StripeClient 2013-06-20 13:39:06 -07:00
Raymond Yee 93e0e8593c Merge pull request #183 from Gluejar/fix_readmill_redirect
need this to work
2013-06-20 13:35:48 -07:00
eric 5d1f6fa224 quick fix for readmill 2013-06-20 14:34:44 -04:00
Raymond Yee c76a320912 * Comment out current payment.manager.PaymentManager.pledge -- tests run ok -- so it looks like I suspect: that we don't use that code and it's a hold-over from PayPal code
* stub for stripelib.Processor.Pay
2013-06-19 18:54:32 -07:00
eric 5fe6f5d3a0 no campaigns *right now* 2013-06-18 09:39:57 -04:00
eric 1e310e8896 fix overzealous global replace 2013-06-14 23:09:55 -04:00