Commit Graph

1268 Commits (7bf32de3f51e7ae7e839609ddf02db58c0510798)

Author SHA1 Message Date
Raymond Yee 749420eb30 Merge pull request #502 from Gluejar/load_from_yaml
Load from yaml
2015-08-06 10:28:23 -07:00
eric 6184b32b4d missing relator case 2015-08-04 12:58:48 -04:00
eric cc21ac2edb add publisher feed
but don't expose it
2015-08-03 16:58:02 -04:00
eric a469b025d3 add filter for ebooks
so only pdf ebooks are shown in pdf feeds, only CC-BY ebooks are shown
in  CC BY feeds
2015-08-03 16:22:40 -04:00
eric f79daf09db use gitenberg.metadata 2015-08-03 10:04:07 -04:00
eric c9ae756743 add url to loaded ids 2015-07-31 16:34:47 -04:00
eric 7932e047d7 basic api wiring 2015-07-30 00:34:05 -04:00
eric 098eddc327 work in progress 2015-07-29 23:01:43 -04:00
eric 5185410825 get tests to pass 2015-07-28 09:41:55 -04:00
eric 1462d9e04d tweaks 2015-07-28 01:29:55 -04:00
eric 44cd1eb19b add relation support to edition edit 2015-07-28 00:52:21 -04:00
eric 7c31bb115e fix authors.remove 2015-07-27 23:44:34 -04:00
eric e386dccb49 show non-author relations 2015-07-27 23:21:11 -04:00
eric 088bdff782 fix add_author 2015-07-27 23:20:30 -04:00
eric 50429e4f1b migrate model
add through relation to authors
add authority code to subjects
2015-07-27 16:22:04 -04:00
Raymond Yee 7b3360b235 Merge pull request #497 from Gluejar/catch_stk_timeouts
move mock ebook class to acq
2015-07-09 14:09:24 -07:00
eric 449f38fe7d move mock ebook class to acq 2015-07-09 15:08:16 -04:00
Raymond Yee 153a582cf0 Merge pull request #484 from Gluejar/add_yahoo
Add yahoo sign-in
2015-06-17 16:39:47 -07:00
Raymond Yee 3b575d10f6 changed default python social auth exception handling to catch the exception and send backend/error message to error page.
I've decided to display the backend but not the error message.
2015-06-17 15:39:27 -07:00
Raymond Yee bb74261013 sample book (temporarily) not recognized by Google Books API 2015-05-27 12:37:47 -07:00
eric 8d53a016f9 update facebook picture 2015-04-17 11:46:29 -04:00
eric f340826276 fb id to bigint 2015-04-16 23:20:29 -04:00
eric 7715551671 fix auth pipeline classes 2015-04-15 10:50:36 -04:00
eric 4944df8e78 error introduced by a comment 2015-04-10 15:10:55 -04:00
eric dab8954388 this is why we have tests 2015-04-09 13:12:22 -04:00
eric 97579bda71 re-establish un length limit 2015-04-09 12:41:00 -04:00
eric a8cab6c0ae get google oauth2 working 2015-04-07 22:55:30 -04:00
Raymond Yee 53a37b1b31 Merge branch 'master' into mobigen_integrate 2015-04-03 10:05:02 -07:00
eric 1739e94177 returned gbooks thumbnail urls have changed 2015-03-18 14:59:38 -04:00
Raymond Yee b0550999e1 incorporate changes from kindle safe title changes.
Merge branch 'master' into kindle_file_size

Conflicts:
	frontend/views.py
2015-03-09 10:56:20 -07:00
Raymond Yee 71c8a95b90 add comment about what fix_kindle_bugs does 2015-03-06 15:16:04 -08:00
eric 0c4550fe4a save ebook file size on send_to_kindle
don't deal with booxtream (b2u) ebooks at a all, only deal with free
ebooks
2015-03-05 22:30:03 -05:00
eric f05b276118 provide a title that's kindle-safe 2015-03-03 17:39:23 -05:00
Raymond Yee 9c4d609579 Merge pull request #459 from Gluejar/download-nits
add inactive download counts in rh tools [fix #88928040]
2015-02-25 11:21:08 -08:00
eric 84227748db add inactive download counts in rh tools 2015-02-23 16:52:55 -05:00
eric 53ecbfcb5f DRY for safe_get_work 2015-02-18 12:47:19 -05:00
Raymond Yee a9d4a71912 fixed an incorrect reference, uncovered by the tests! 2015-02-03 15:41:38 -08:00
Raymond Yee edd65c08c3 make sure the campaigns for the editions returned by editions_to_convert are not b2u. 2015-02-02 15:05:36 -08:00
eric 53b62642cd more idiomatic increment 2015-02-02 13:31:10 -05:00
eric c714de0d67 also for doab records 2015-01-30 11:39:48 -05:00
eric 7cb0f473de remove many-commas subjects, prevent their addition 2015-01-30 11:33:22 -05:00
Raymond Yee 32ec6b0a03 Merge pull request #449 from Gluejar/improve_gifts
Improve gifts
2015-01-28 11:59:27 -08:00
Raymond Yee 0b7f522232 first pass at a command to convert all the convertible campaign ebooks to mobi 2015-01-26 12:19:26 -08:00
Raymond Yee dfbdf9bbd7 add a test for mobigen 2015-01-26 09:48:16 -08:00
Raymond Yee e9d8080c3b First cut of celery tasks for converting to mobi 2015-01-23 15:52:35 -08:00
Raymond Yee 6c1630905b Merge branch 'master' into mobigen_integrate 2015-01-23 10:43:33 -08:00
eric ea5adba871 add notifications for unredeemed gifts 2015-01-23 13:11:19 -05:00
Raymond Yee 61c0de3fbc add a command to delete subjects with non-xml characters 2015-01-22 15:48:04 -08:00
Raymond Yee b4776f36e2 Merge branch 'master' into mobigen_integrate 2015-01-20 13:13:58 -08:00
eric aa14bcb5c9 fix github matcher 2015-01-19 12:10:07 -05:00
Raymond Yee 1be246586c Merge pull request #443 from Gluejar/edit_kw
Edit kw
2015-01-16 09:17:11 -08:00
eric 154701bea5 show most common keywords first 2015-01-16 08:56:36 -05:00
Raymond Yee 50fae7d544 Running into validation problems with OPDS because "image/image" mime-type for
urls like https://github.com/Gluejar/open_access_ebooks_ebook/blob/master/open_access_ebooks/EPUB/cover.120.jpg?raw=true

Fix by looking at the ending of the path of a url, not the fragement, parameter, or query string
2015-01-14 18:29:17 -08:00
eric 4f0cc87b48 temp add kw 2015-01-14 15:07:54 -05:00
eric ea4e489213 fix the odds implementation of kw facet
mostly, fixing missing url encoding
2015-01-12 12:03:47 -05:00
Raymond Yee 134988f082 modify migration to handle situation in which a subject does not exist (e.g., Selenium tests) 2015-01-11 12:44:31 -08:00
Raymond Yee 684c518324 add comments to clarify intention of parts of facets.py, based on Eric's answers to Raymond's questions 2015-01-11 12:18:30 -08:00
eric 62daa67880 coming together! (needs migration) 2015-01-09 17:05:34 -05:00
Raymond Yee f08c721d2e Merge pull request #434 from Gluejar/give_btu
Give btu updates: gift table revamp, add gift admin
2014-12-22 15:31:50 -05:00
eric 5e4b7a7b89 fix wrong field type in model 2014-12-22 13:49:39 -05:00
eric 6fc3eb8703 turns out we can't send notifications to inactive accounts
I had intended that gift redemption would activate the account, but
that doesn't work. Need to figure out the downside to having unverified
active accounts.
2014-12-22 13:24:22 -05:00
Raymond Yee 642653c4f8 Merge pull request #433 from Gluejar/give_btu
bug fix in give_btu
2014-12-22 11:50:18 -05:00
eric c85fd340d8 how did that sneak through? 2014-12-22 11:47:34 -05:00
Raymond Yee 05686ffaec Merge pull request #432 from Gluejar/give_btu
Give btu updates
2014-12-22 09:04:08 -05:00
eric ae208286f0 handle case of double gifts
also make gift redemption experience uniform
2014-12-21 16:02:02 -05:00
Raymond Yee 20c3ffe12e Merge pull request #430 from Gluejar/give_btu
As requested by Eric, I'm now going to do the merge to get this PR on just.  Then I'll test downloads.  Noting the current commit on master in case we need to revert: 25dcb06f46
2014-12-20 15:42:00 -05:00
eric 5719f7f90c forgot to actually test the code 2014-12-20 13:14:05 -05:00
eric b01562b630 Properly handle gifts to existing users 2014-12-20 12:47:15 -05:00
eric f18acfc091 notify the giver when the gift is redeemed
migration needed
2014-12-19 15:13:54 -05:00
eric 2c44a29aa7 regifting 2014-12-18 13:37:28 -05:00
eric 1c651f2458 everything more or less works except resifting 2014-12-18 01:07:59 -05:00
eric 41163d81a2 purchase and provisioning the gift 2014-12-16 14:18:51 -05:00
Raymond Yee b9aee9095b Merge branch 'master' into mobigen_integrate 2014-12-16 08:55:51 -08:00
Raymond Yee ac39075ccd a comment to explain logic of reset_free_flag 2014-12-15 11:46:59 -08:00
eric 7b5174aca6 ui and model for buy as a gift 2014-12-15 00:56:08 -05:00
eric be0ab46872 use is_free in query sets 2014-12-14 10:00:10 -05:00
eric b54b21fdfe keep is_free up to date 2014-12-13 12:37:35 -05:00
eric c9270b154a Merge branch 'master' into free_flag 2014-12-13 11:55:02 -05:00
Raymond Yee 19dd7eadcb Merge pull request #425 from Gluejar/opds_facets
Opds facets [deliver #82001456]
2014-12-12 11:42:04 -08:00
eric 7ceaffd124 add is_free flag 2014-12-11 23:01:13 -05:00
Raymond Yee 6c824e38af Added another clarifying comment 2014-12-11 14:34:04 -08:00
Raymond Yee f24478d641 Add a comment to explain logic KeywordFacetGroup.has_facet in response to explanation in https://github.com/Gluejar/regluit/pull/427#discussion_r21712785 2014-12-11 14:08:19 -08:00
eric 8c9bccc1f0 keyword facets!
for example, /free/kw.Fiction/
2014-12-10 17:14:28 -05:00
Raymond Yee 5995ae610a Moved code to call the mobigen service from .ipynb to regluit.core.mobigen (may eventually want to move core/mobigen.py to external package) 2014-12-09 11:56:27 -08:00
Raymond Yee e76b1feccc Merge branch 'master' into opds_facets 2014-12-08 16:06:44 -08:00
Raymond Yee f7b796c6a6 Merge pull request #421 from Gluejar/facets
Facets [deliver #70680500]
2014-12-08 15:21:49 -08:00
Raymond Yee 95958847ed Since http://jenkins.unglueit.com/job/regluit/2912/console, the cover images from Google Books api are now starting with http and not https, which is strange.
This fix allows the test to pass for http or https book covers
2014-12-08 10:09:05 -08:00
eric badf8e4b0e bring back descriptions, use them 2014-12-05 20:38:08 -05:00
eric ab6eb0eed5 revise the top level feeds 2014-12-05 20:37:51 -05:00
eric 5246bd1a1c add new facet machinery to olds 2014-12-05 18:38:04 -05:00
eric 70d4506365 move path parsing to facets 2014-12-05 18:36:45 -05:00
eric f689bcf6bd I learned something 2014-12-05 09:39:48 -05:00
Raymond Yee 0e3b0468c3 rewrite some classes in facets.py to use instance variables instead of class variables...will matter if we have more than one Facet/FacetGroup at a time 2014-12-04 14:40:30 -08:00
eric 08408dae79 adjust display for ebook rights form 2014-12-03 13:25:01 -05:00
eric 75fab489f1 fix display of license url, title and labels 2014-12-03 13:18:29 -05:00
eric a285b94ddd make spelling consistent 2014-12-03 13:17:43 -05:00
eric af83e6a8c0 Rip out CCList, replace with facets 2014-12-03 10:15:38 -05:00
eric 8e23f937f8 auto generate refine box 2014-12-02 16:09:30 -05:00
eric 533922de9f buggy image 2014-12-01 16:14:38 -05:00
eric eefcee6f32 Merge branch 'master' into facets 2014-12-01 16:08:12 -05:00
eric 7913b7e38c wired license facet block 2014-12-01 16:07:41 -05:00
eric a7c9c5a6d7 add license art libre
Also fixed a mistake that left gfdl off of the ebook choices list.
correct spelling is "license art libre"
2014-11-23 16:44:59 -05:00
eric 2264926301 Merge branch 'master' into facets 2014-11-20 22:12:18 -05:00
eric c87004122d add GDFL to campaign choices
needed for framasoft translation of a Stallman book
2014-11-20 21:34:19 -05:00
eric 20cf22da8f add facet descriptions. 2014-11-20 21:11:15 -05:00
eric 5dd1d836fb add sorting 2014-11-18 16:54:19 -05:00
eric 9aa6d0c78c Merge branch 'master' into facets 2014-11-18 13:33:51 -05:00
eric 591f06a267 first pass at faceted search 2014-11-18 13:33:17 -05:00
eric b7aaa155a0 sloppy error 2014-11-17 13:30:02 -05:00
eric 7e1c5eeec9 add github and wikibooks to allowed ebook sources 2014-11-17 11:51:36 -05:00
Raymond Yee db969f859d Merge pull request #412 from Gluejar/privacy
I will do the merge to test the dropbox functionality on just.
2014-11-14 14:43:27 -08:00
eric 3d71917d70 self-host license badges 2014-11-10 13:14:59 -05:00
eric 547adfea56 Change default avatar to one with more privacy
using a user's email in the gravatar hash can connect their account to
other sites. Stop doing this as default for new users.
2014-11-07 14:47:12 -05:00
Raymond Yee b08cdbf2bc Merge pull request #410 from Gluejar/load_marc
Load marc
2014-11-06 17:52:14 -08:00
Raymond Yee bad86da003 Merge pull request #409 from Gluejar/opds_paging
[finish #78017168] Opds paging
2014-11-06 16:54:52 -08:00
eric 4b250ec9d8 this allows admin to edit a work without featuring it 2014-11-06 14:23:34 -05:00
eric 4e4d1debd0 fix bug in isbn module 2014-11-05 18:33:30 -05:00
eric df913fab09 some feed consumers want images for both sizes 2014-11-03 19:57:58 -05:00
eric e41dd676c8 add stub record indicator 2014-11-03 16:29:36 -05:00
eric aeb07049da delete core.marcrecord table 2014-11-03 14:52:43 -05:00
eric fafd37a973 Merge branch 'master' into marc_package
Conflicts:
	core/marc.py
	static/css/campaign2.css
2014-10-30 12:38:53 -04:00
eric c5bb7220f2 don't link cover to google books if own cover 2014-10-29 15:18:32 -04:00
eric d0e305cfec rip out code 2014-10-27 19:11:44 -04:00
eric 3b4b836e6c add marc download tools 2014-10-27 11:55:46 -04:00
Raymond Yee 98b5af63cc a proposed fix for when edition.publisher_name is None 2014-10-25 17:43:15 -07:00
eric 96a94378a2 on-line fix 2014-10-25 12:02:27 -04:00
Raymond Yee 78ddf22c18 Merge branch 'master' into stub-marc 2014-10-22 02:04:00 +00:00
eric 73003ba1c2 stub loader 2014-10-20 16:57:20 -04:00
eric a5d3dfdf4f add_author method 2014-10-20 16:54:19 -04:00
eric 9de0474386 start moving marc code to its own package 2014-10-17 17:14:02 -04:00
eric be294aa8f0 Merge branch 'master' into stub-marc 2014-10-17 11:36:35 -04:00
eric 3e21430e13 # in MARC spec means blank space 2014-10-17 11:30:55 -04:00
eric a085a5fcca add more metadata from db
008, authors, publishers, isbn, pub date from db
2014-10-16 17:14:54 -04:00
Raymond Yee 1dd114bc74 add to migration the change in default collation for core_identifier. One possible problem is that this code is mysql specific. In practice, not a problem for now since we're using mysql. 2014-10-15 07:46:50 -07:00
eric d8d97faee2 change size of value column
This migration will throw an error unless the entire table has
collation utf8_bin because of the unique together constraint. Also, 250
is the largest size we can have with mySQL as back end (together with
the unique together index)
2014-10-14 15:42:57 -04:00
eric fbe96bcfc7 basic stub records 2014-10-14 10:08:08 -04:00
eric 93c9b696b2 Allow staff to enter books with an http id
I'm finding LOTS of books that don't have ISBN or OCLCnum
2014-10-08 16:23:24 -04:00
eric ef6c4a659e ebook files activate and deactivate
when manager unselects 'add_ask', the system didn't revert to the files
without added ask. This fixes that. To test, toggle the add_ask
checkbox and save campaign.
2014-10-04 16:51:16 -04:00
eshellman 2223446f36 Merge pull request #386 from Gluejar/pdf_ask
Insert Pdf/epub ask into served files [Take 2]
2014-09-17 04:48:46 -04:00
eric 6c9f4459b3 only set LC as source if LC is source 2014-09-12 17:44:41 -04:00
Raymond Yee 2651e79a3c syntax error 2014-09-12 14:37:22 -07:00
eric 8423e5442b fixed error when record is not from LC 2014-09-12 11:49:07 -04:00
eric 28434b06a1 now do the same for epubs 2014-09-05 16:35:57 -04:00
eric 6bccb4b3f8 bugfix 2014-09-05 13:30:09 -04:00
eric 30e50260a3 make ebooks when new files are uploaded, clean up old
the download bits are suppressed when the ask comes from the pdf
seems we weren't making new ebooks when new files were uploaded
old ebooks now deactivated so we don't loase download counts and history
add ask to pdf is triggered by file upload or THANKS campaign save
2014-09-04 18:33:20 -04:00
eric 7c88bf107f typo 2014-08-30 13:31:12 -04:00
eric 40831b6161 incorporate add_ask into campaign management 2014-08-30 12:04:50 -04:00
eric 73c616092d campaign.add_ask_to_ebfs for pdfs 2014-08-28 15:29:41 -04:00
Raymond Yee 7b7c050fb2 Merge pull request #379 from Gluejar/edition_errata
Edition editing errata
2014-08-13 22:30:49 -07:00
Raymond Yee edb769317d Merge pull request #375 from Gluejar/new_campaign_options
no contrib form if the ask is all zero
2014-08-07 15:58:22 -07:00