Commit Graph

1124 Commits (6c1b14c3ccdff40285208f46cba2b93fb39dcc51)

Author SHA1 Message Date
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
Raymond Yee b356699c9b First pass at /opds/{facet} --> now with active_campaigns too 2014-06-25 18:05:57 -07:00
Raymond Yee 8830919318 Add feed=opds to download URLs for ebooks in OPDS feed 2014-06-25 16:54:01 -07:00
Raymond Yee 49133935a0 First draft of opds/creativecommons.xml 2014-06-24 15:27:40 -07:00
eric f38dd948f9 this is all I need to do to skip the claim approval step.
We can always revoke the claim
2014-06-20 14:26:28 -04:00
Raymond Yee b675052736 Merge pull request #362 from Gluejar/edit_language
Edit language [finish #69779438]
2014-06-11 15:13:10 -04:00
Raymond Yee d17836fb58 put in fix to LT scraper -- need now to hit front page to pick up session-like cookies 2014-06-11 08:46:24 -04:00
Raymond Yee f43d40b9f4 [#70942940] Making load_doab_edition more rigorous:
* assuming that 1 DOAB ID associated at most with 1 Work or 1 Edition
* explicitly throw exception if Google Books doesn't recognize the ISBN in question
2014-06-06 16:40:13 -07:00
eric 13f4bfc28d stop filtering language=en in work lookups 2014-06-06 15:42:51 -04:00
eric 7e72a8fff6 remove code that was truncating language codes 2014-06-06 14:47:36 -04:00
Raymond Yee 54c3742ce7 adding a command to load doab books 2014-06-06 11:37:10 -07:00
eric 03f3dd1287 can now edit language via edition edit
Also, the language field is widened to support language ids such as
"zh-tw".
Migration required.
2014-06-06 14:32:34 -04:00
Raymond Yee efdbdf6643 [#70942940] Making the DOAB record loading asynchronous (ie., use Celery) 2014-06-05 16:31:14 -07:00
Raymond Yee 265420dd74 some code to load DOAB records...no code here yet for how I processed the DOAB records into json format yet. 2014-06-04 15:23:47 -07:00
eric a55c31d3ff fix test 2014-05-22 13:19:05 -04:00
eric 314847459b remove readmill, add dropbox 2014-05-20 12:19:34 -04:00
Raymond Yee 4d359b53c1 Merge pull request #348 from Gluejar/list_by_license
List by license [#70951010]
2014-05-14 09:14:03 -07:00
eric 199f862c5f typo 2014-05-08 12:59:39 -04:00
eric 052f5adbc0 add license descriptions and badges to the pages 2014-05-08 11:54:09 -04:00
eric a3ae7e3177 fix test errors. yay tests. 2014-05-08 10:49:59 -04:00
eric de6b8555d1 move CC constants into a module 2014-05-08 10:21:50 -04:00
Raymond Yee c92219f673 Revert "Reverting changes made to fix double click problem -- and moving changes to fix_double_click"
This reverts commit 643d8d358d.
2014-05-07 15:37:19 -07:00
Raymond Yee 6bf70c4f79 Skipping Goodreads test 2014-05-02 14:20:37 -07:00
Raymond Yee 643d8d358d Reverting changes made to fix double click problem -- and moving changes to fix_double_click
Revert "move post monkey subscribe into a task"

This reverts commit 9556c4a792.
2014-05-02 13:59:04 -07:00
eric 9556c4a792 move post monkey subscribe into a task
I'm not able to verify that this works better
2014-05-02 14:07:59 -04:00
eric 183dea1511 patch the personalizer 2014-04-30 15:17:10 -04:00
eric 1c923e63b6 handle exception when no edition
Occurred for 100 years of solitude probably during regrouping
2014-04-28 14:23:43 -04:00
eric 9287825d6e pdf and mobi not displayed in campaign management 2014-04-28 10:59:03 -04:00
eric 0ef460b09e book loader was stomping on selected edition selections 2014-04-14 17:43:06 -04:00
eric 5661377207 if library supports t4u book, members of library don't see the ask
instead they see “your library has supported this free ebook!
2014-03-18 22:30:21 -04:00
eric 878970df4b notification cleanup 2014-03-14 14:28:21 -04:00
eric 5e916e945d [fix #62816484] don't put it on reserve if it's the library buying 2014-03-14 12:39:49 -04:00
eric cce7c43d8f revamp edition display and editing
1. created editions display view (work(action=editions))
2. moved split function to new editions page (staff only)
3. added edition selector (staff only)
4. moved ebook link addition to edit edition page
5. standard work display shows only 10 newest editions (much faster!)
6. campaign managers should be able to edit editions
7. ebook links can’t be added when there’s a campaign.
8. more room for edition description editing
2014-03-11 17:34:27 -04:00
eric ebc3a1a02a add selected_edition, earliest_publication 2014-03-10 22:22:14 -04:00
eric 8a5d92adaf remove public_domain
never used, not accurate
2014-03-10 15:48:53 -04:00
eric f27b111117 fix twitter avatars [#66896902] 2014-03-06 17:53:37 -05:00
Raymond Yee 256c60fbfc Merge branch 'master' into t4u_download
Conflicts:
	core/models.py
2014-03-03 11:08:50 -08:00
eric 4d2054af07 less fake test 2014-03-01 22:42:26 -05:00
eric 3986124464 fix two bugs 2014-03-01 17:13:57 -05:00
Raymond Yee ae531e0d7d Merge branch 'master' into t4u_download 2014-02-25 19:10:01 -08:00
eric 482d9be31d add b2u test links to campaign management page 2014-02-25 13:58:33 -05:00
eric bd829aff25 On reflection, files_reviewed was a bad idea 2014-02-25 12:54:14 -05:00
Raymond Yee 7fda4abd1c Merge branch 'master' into unglued_b2u_mobi 2014-02-24 14:44:13 -08:00
Raymond Yee 62737954cb Merge branch 'master' into useability_tweaks 2014-02-24 10:07:09 -08:00
Raymond Yee a87065f70e Merge branch 'master' into unglued_b2u_mobi 2014-02-21 13:24:20 -08:00
eric 1c9c953e30 fix email notice 2014-02-21 15:23:56 -05:00
eric 92e870d2b7 Merge branch 'master' into t4u_download 2014-02-21 13:18:04 -05:00
eric e66c54e3dc fix test failures 2014-02-21 13:16:55 -05:00
eric c7abcb357b report anonymous contributions 2014-02-20 16:31:13 -05:00
eric 678eb02847 Thanks works with anonymous user 2014-02-20 15:56:10 -05:00
eric 737cf91c66 complete switch to "Faves/Favorites" language 2014-02-19 23:16:28 -05:00
eric b5fd630bfc Thanks mostly works. 2014-02-19 22:18:23 -05:00
Raymond Yee 9ef421a696 A pragmatic fix -- given we're essentially not running this test anyhow. 2014-02-14 11:18:35 -08:00
eric 36ebc83a5b adapt work and book panel to t4u
also: start migration to “Fave”
also: start showing faves on ready to read books
also: on panel view, fixed the num-wishes link was unclickable
but: the fave count looks ugly
2014-02-11 11:37:39 -05:00
eric bb676f9500 missing step in THANKS campaign launch 2014-02-10 20:16:56 -05:00
eric a4488c45ce make campaign creation really work the way it should
Problem was that rh_tools forms were not being updated correctly after
creating a campaign.
2014-02-08 15:29:27 -05:00
eric 2d7330b447 Not sure why a test of this decided to fail now! 2014-02-05 20:56:30 -05:00
eric 87387baa32 add file review requirement for b2u and t4u campaigns
migration needed!
2014-02-05 19:33:55 -05:00
eric fe931c7835 uploader now generates mobi for unglued b2u files 2014-02-05 17:02:21 -05:00
eric 25d9923337 THANKS has null target 2014-01-30 11:59:17 -05:00
eric 3bfbbd7653 Merge branch 'master' into t4u_file_upload 2014-01-30 11:53:20 -05:00
eric 4c9aba2b47 authors should always return a query set 2014-01-23 23:04:52 -05:00
eric e540bb7a56 all authors now display
had to harden the work model  against works without editions to pass
tests
Lagos 2060 will need 1st author to change back
added work.authors_short to work model and to search work mock model
used work #415 as an example of a work with 3 authors
2014-01-17 21:37:19 -05:00
eric f101f0dc20 Merge branch 'master' into multi_author_display 2014-01-15 21:22:49 -05:00
eric b3465ea084 search code for dependence on deadline being not null 2014-01-15 17:59:45 -05:00
eric df7dd775bf add authors method to work 2014-01-15 15:16:24 -05:00
eric 1b656ad76a fix missing launch button
t4u work removed the deadline in b2u campaigns, resulting in a failed
criterion for shooing the launch button. Have moved all the
launchability logic to the campaign model
2014-01-15 10:19:57 -05:00
eric 66ca501327 temp commit 2014-01-15 08:32:55 -05:00
eric 66e241441b make cc_date less crash 2014-01-13 14:32:03 -05:00
eric f3a04aff99 Merge branch 'master' into thanks4u_ 2014-01-03 18:47:51 -05:00
eric 70004a0f0f can create a THANKS campaign 2014-01-03 14:15:26 -05:00
Raymond Yee 7d7cbfc7f8 Merge pull request #275 from Gluejar/bugfixes
Bugfixes
2013-12-31 11:21:11 -08:00
eric b8c7b8afa7 add a page that lets rhs see the premiums earned by ungluers 2013-12-30 21:51:32 -05:00
eric af8fe05c54 fix same email bug
This bug [#63071834] was caused by a bug in Registration 1.0, which
fires the account_activated signal twice. There's already a pull
request fixing this bug.

In reviewing this handler, I realized that all the other reg code is in
library_auth, so I moved the same_email code there. I also decided that
the utility of attaching to the old email address was insufficient to
over come the risk of people stealing accounts by messing with social
auth.
2013-12-30 11:49:04 -05:00
eric c3c3d5b9c4 don't want "ending soon" notifications on B2U 2013-12-20 17:33:55 -05:00
Raymond Yee eb416e75dd Merge branch 'master' into switch_watermarking 2013-12-19 18:02:43 -05:00
eric a05c3d27f1 Merge branch 'switch_watermarking' into thanks4u 2013-12-18 16:06:30 -05:00
eric 973d2c3bc0 made watermarking optional [#62120182]
apply migrations
2013-12-18 12:34:53 -05:00
Raymond Yee 0d28fbab7e Merge branch 'master' into ban_disposable_emails 2013-12-18 08:54:11 -08:00
eric 098b185a5a turn off mailchimp checking for tests 2013-12-16 15:11:25 -05:00
eric 40e611bac5 revive the gift/donation credit funtionality, at least for b2u campaigns
The reason for doing this is so a library can put in money with one
check, then use it up gradually. (we get to pocket the fees that would
go to stripe) One change here- in b2u there is an extra click to get to
download page, even if no gift credit is involved - this way the user
knows what and how he's bee charged
2013-12-15 00:31:06 -05:00
eric 2892a22824 change terminology from "donation" to "gift" 2013-12-13 15:15:35 -05:00
Raymond Yee be080223bd Make core.BookLoaderTests.test_ebook check the ebooks only if they show up...the public domain status of book fluctuates. 2013-12-10 16:17:12 -08:00
eric a3a1853a3b fix test 2013-11-29 16:04:22 -05:00
eric e014114a52 preclude possible inter-instance data leakage 2013-11-18 18:22:09 -05:00
eric 0a9e3b8c79 I officially hate working with zipfiles 2013-11-17 23:24:03 -05:00
eric a1cea30cba fix percent for campaign preview
somehow googlebot found a link to the "preview" of Stephen Black's
campaign.
Not an urgent fix, but thanks, googlebot.
2013-11-15 23:06:08 -05:00
Raymond Yee 2959b68549 Merge pull request #246 from Gluejar/b2u_ungluify
B2u ungluify
2013-11-15 15:59:05 -08:00
Raymond Yee a98b43ede3 replace example book with one recognized now by Google Books 2013-11-15 15:47:02 -08:00
eric 188d34ea51 added test for b2u ungluify
(also tests now invoke booxtream in test mode)
2013-11-15 11:25:41 -05:00
eric a701edf3b2 make ebook entries yay 2013-11-15 02:10:14 -05:00
eric efea7d0198 on success, add a cc license, watermark (and generate mobi), and save 2013-11-14 23:16:55 -05:00
eric c6edd83884 Merge branch 'master' into b2u_ungluify 2013-11-14 14:58:22 -05:00
eric 5d4539b305 enable ebookfile download and secure ebookfile storage 2013-11-14 14:48:16 -05:00
eric 9cf7385324 move campaign completion logic to campaign 2013-11-14 12:40:01 -05:00
eric 0dad79a3d4 fix bug comparing dates with times 2013-11-14 12:38:58 -05:00
eric a64c9470e2 StringIO should be fed a unicode string if possible 2013-11-12 18:48:43 -05:00
eric e4b3d387fe correct documentation notes 2013-11-12 14:58:29 -05:00
eric e9de656bfc make sure current_total gets updated 2013-11-12 14:58:11 -05:00
eric 2786b871d3 update status now works for b2u 2013-11-12 14:48:04 -05:00
Raymond Yee f016bbb4c1 Merge pull request #240 from Gluejar/reserves
fix silly method of turning off notifications
2013-11-12 06:01:53 -08:00
eric ffd6796bfd fix silly method of turning off notifications 2013-11-10 10:28:22 -05:00
Raymond Yee 073b618fd8 must preface timedelta with datetime 2013-11-08 21:30:18 -08:00
eric 00693f7a23 Merge branch 'master' into reserves
Conflicts:
	core/models.py
2013-11-08 16:07:29 -05:00
eric 0840a1fd71 implement holds. Also fix borrow view that didn't specify work. 2013-11-08 12:13:34 -05:00
eric 2d86584129 add Acq to admin system 2013-11-06 23:25:52 -05:00
eric 520fef9f18 set emails in fixtures to avoid test failures on notification 2013-11-06 19:19:18 -05:00
eric 50134907cd also want tests to pass 2013-11-06 17:20:13 -05:00
eric f5f58dfba6 don't want tests to generate email 2013-11-06 15:43:54 -05:00
eric ca540c4cb4 wired up claim notifications [#37257639] 2013-11-06 14:58:50 -05:00
eric f6f3c4fc04 booxtream default ex libraris page boasts about "Social DRM". yuck. 2013-11-03 17:19:23 -05:00
eric 757927220e this is what caused "Open Access" to fail for Raymond last week. 2013-11-03 17:14:13 -05:00
eric 6bdbe1d046 user can buy multiple library licenses [#59827932]
also, some logic needed cleaning for setting expires on reserves
2013-11-01 16:15:01 -04:00
eric c79572e8e4 notifications when user joins library or user borrows a book 2013-10-31 12:26:43 -04:00
eric d740d98e51 turned off requests logging from bookloader
the messages from requests were more than useful
2013-10-30 12:42:59 -04:00
eric 53d9f2c8be library ungluer list is library members 2013-10-19 21:01:10 -04:00
eric 76562f83ad fix test errors 2013-10-19 17:27:53 -04:00
eric cc8375bf4a bookpanel reflects in-library and out on loan state 2013-10-19 16:54:09 -04:00
eric 6e7344d8a4 and now, you can borrow a library book! yay! 2013-10-18 15:35:48 -04:00
eric 60cd2f626b borrowability reflected on work page 2013-10-18 13:33:47 -04:00
eric 93d128102e display of borrowability and library holdings
needed another date column on acqs to manage this
bookpanel getting complicated- moved some logic into tempalte tags
library page now shows b2u books it owns
"library" has its own view now
2013-10-18 12:36:55 -04:00
eric c2649f6ab2 implemented borrowing methods, "BORROWED" license acq, RESERVES
includes a schema migration!
2013-10-16 22:48:29 -04:00
eric e6573ac0c5 library user can buy a library license 2013-10-15 16:18:30 -04:00
eric 157d41eead make the purchase options reflect user libraries 2013-10-11 17:50:54 -04:00
eric fcc1876859 Revisit manage_campaign page for b2u 2013-10-11 12:50:59 -04:00