Commit Graph

1148 Commits (370680d5ca7062787c156788da5ee96c9d8a4c7f)

Author SHA1 Message Date
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
eric 5a2a3e60b6 add PD and GDFL to license choices; add pd-us
also all make list display facets for PD-US and GDFL; don't expose them
until we have content we like in them
2014-08-06 17:14:09 -04:00
eric a08fc4441c eliminate spurious ids for un-saved editions 2014-08-06 16:18:00 -04:00
eric af3ea58b7b examined order_by queries, added indices as required 2014-07-31 12:17:42 -04:00
eric 833654d89f update launch able to reflect no-ask campaigns 2014-07-29 22:43:37 -04:00
Raymond Yee 440b352fff Set publisher name for edition 2014-07-25 15:16:06 -07:00
Raymond Yee 307db5a995 Merge branch 'master' into doab_load 2014-07-25 14:45:22 -07:00
eric aa84366418 no contrib form if the ask is all zero 2014-07-25 14:43:54 -04:00
Raymond Yee 967bd2dcae code can now load description, subjects and covers for the pdf files 2014-07-24 16:29:28 -07:00
Raymond Yee 45a89ee055 Merge branch 'master' into doab_load 2014-07-22 15:36:40 -07:00
eric 6aa3e458ea move opds to api
and simplify code.
view no longer passing site and protocol to opds methods
facets now in a list
url adds /api/ in front
2014-07-16 16:47:32 -07:00
Raymond Yee 7f02fcd126 The doab_load_books django command is working again -- I had to fix the signatures of some methods 2014-07-16 15:26:19 -07:00
Raymond Yee 806e24dc80 Merge pull request #367 from Gluejar/OPDS
Opds
2014-07-11 14:13:13 -07:00
Raymond Yee 7df31ee53d Merge branch 'master' into doab_load 2014-07-10 13:12:08 -07:00
Raymond Yee 84a102c640 Merge pull request #368 from Gluejar/featured_ebook
Featured ebook
2014-07-09 10:19:01 -07:00
Raymond Yee f40350c868 Merge branch 'master' into doab_load 2014-07-08 14:14:51 -07:00
Raymond Yee d14a0dc497 Fixed bug in load_doab_edition: new Work needs to be saved before attaching IDs to it.
code in doab_load.ipynb to load books and test the integrity of the load.  Big surprise (to me):  to find invalid ISBNs in the DOAB data
2014-07-08 09:29:31 -07:00
Raymond Yee 5b3a8d7b13 I've moved the new version of load_doab_edition into core/doab.py from notebook.
Code in doab_loading.ipynb for testing the loading
2014-07-07 11:00:52 -07:00
eric 77a4ef1c09 address "opening a campaign" comments
"hastens" isn't quite right; adding a tooltip to the delete function
would require mucking with django-selectable, and that will take more
time than its worth.
2014-07-03 20:26:36 -04:00
Raymond Yee 833f077de1 With the new arguments in doab.json, I needed to add a catch-all **kwargs to load_doab_edition
functions in regluit.core.doab and regluit.core.tasks.
2014-07-03 10:45:57 -07:00
eric bc7850a2a9 add featured column, use it 2014-07-01 10:07:07 -07:00