Commit Graph

233 Commits (f476295b7be89ddcd2b5631707da39918a542c1f)

Author SHA1 Message Date
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
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 4e4d1debd0 fix bug in isbn module 2014-11-05 18:33:30 -05:00
eric 73c616092d campaign.add_ask_to_ebfs for pdfs 2014-08-28 15:29:41 -04:00
eric 7e72a8fff6 remove code that was truncating language codes 2014-06-06 14:47:36 -04:00
eric a55c31d3ff fix test 2014-05-22 13:19:05 -04:00
Raymond Yee 6bf70c4f79 Skipping Goodreads test 2014-05-02 14:20:37 -07:00
eric 0ef460b09e book loader was stomping on selected edition selections 2014-04-14 17:43:06 -04:00
eric 8a5d92adaf remove public_domain
never used, not accurate
2014-03-10 15:48:53 -04: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 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
Raymond Yee 9ef421a696 A pragmatic fix -- given we're essentially not running this test anyhow. 2014-02-14 11:18:35 -08:00
eric 3bfbbd7653 Merge branch 'master' into t4u_file_upload 2014-01-30 11:53:20 -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 973d2c3bc0 made watermarking optional [#62120182]
apply migrations
2013-12-18 12:34:53 -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 0a9e3b8c79 I officially hate working with zipfiles 2013-11-17 23:24:03 -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 0840a1fd71 implement holds. Also fix borrow view that didn't specify work. 2013-11-08 12:13:34 -05: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 de2e56a25a add campaign to test to exercise the inserted file 2013-09-18 17:36:42 -04:00
eric ed341884ea add license page to epub before sending it for watermarking 2013-09-15 21:43:58 -04:00
eric 6294c15aad TGFT 2013-09-06 00:14:06 -04:00
eric aad6d72207 Merge branch 'master' into b2u_download
Conflicts:
	core/signals.py
2013-09-05 22:56:46 -04:00
eric b801eb4927 add acq handling to download
needs migration. should migrate core back to 0052 to refresh acq table

download page no longer passes ebook ids to send_to_kindle, url
calculations are now done in view
2013-09-05 22:54:11 -04:00
Raymond Yee 4e161bebe6 explicit import of regluit.core.parameters
move to using the openly available github hosted version of Eric's Open Access Ebooks for  core.EbookFileTests.test_ebookfile test
Should we delete the static/test epub?
2013-08-28 17:13:35 -07:00
eric 0ba5c9a00e cleanup, plus tests 2013-08-27 18:03:35 -04:00
eric f93fe51e29 days_per_copy properties 2013-08-22 14:23:47 -04:00
eric 26c4d522b4 made the cc_date and test consistent whether its a date or a datetime 2013-08-19 16:01:32 -04:00
eric bf5dcd688a fix some date comparison code to get tests to pass 2013-08-18 15:18:01 -04:00
eric 2c06139a6f make dollar/day a float validate cc_date_initial, max target prevent changes after launch 2013-08-10 16:29:58 -04:00
eric 7f325c0775 Finish B2U Campaign setup 2013-08-09 19:00:54 -04:00
eric 75c32569e2 B2U campaign percentages 2013-08-08 22:32:58 -04:00
eric 613c3770e0 Bake in CC Date concept according to blog post, up to campaign creation
http://blog.unglue.it/2013/08/06/a-new-kind-of-ungluing-campaign/

moving the migration...
2013-08-08 19:56:26 -04:00
eric 1bd2918bc3 Merge branch 'master' into ebook_selling 2013-08-07 15:21:57 -04:00
Raymond Yee 0b0bd9c41f [#54240150] Changed ISBN of the Chinese book in https://github.com/Gluejar/regluit/blob/master/core/tests.py#L95 because old ISBN no longer in Google Book 2013-07-29 14:49:18 -07:00
Raymond Yee a6f9e524e1 [Finishes #53514857] Change ISBNS of test editions 2013-07-16 16:08:20 -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
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
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 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
eric 835ff4be8e Rightsholder can upload ebook files and set buy-to unglue prices [#51733385][#51745045]
note that to test file upload loacal, you need to set up file storage
in local settings. for example,
MEDIA_ROOT = '/Documents/media/'

DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
2013-06-17 18:53:28 -04:00
eric 1ea77acf09 move latest ending logic from form to model/settings 2013-06-17 18:53:28 -04:00
Andromeda Yelton ad69580b2d PEP 8, PEP 328. I feel better now. 2013-06-03 12:31:39 -04:00
eric 144599ac34 fix the download page tests 2013-04-27 16:58:11 -04:00
Andromeda Yelton 7c9973319d donwload page changed, test should change to agree 2013-04-24 15:41:35 -04:00
eric a2606b2e08 move download count display to work infobox and rh_tools 2013-04-20 10:08:10 -04:00
eric de442c8f63 count downloads. migrate schemas! 2013-04-20 00:02:36 -04:00
eric 4180569633 Merge branch 'master' into fix_google_id 2013-04-03 20:07:03 -04:00
eric cd7082a676 test the work identifier methods 2013-04-03 15:45:01 -04:00
eric 56691cd3e0 make sure alias pubname is used for new, add tests 2013-03-27 12:51:10 -04:00
eric d6a8dedfaa mailchimp ops now example.org aware, test users, now all changed to example.org 2013-03-06 09:39:06 -05:00
Raymond Yee cc6a9b1200 Merge pull request #132 from Gluejar/mailchimp_integration
mailchimp integration [finish #37732465]
2013-03-05 19:14:09 -08:00
eric 392a275ded test that everything's chimpy 2013-03-04 17:19:39 -05:00
eric 99c434d940 [fix #45405325] fix merge subjects, also added test 2013-03-01 13:13:14 -05:00
Raymond Yee df0c781f67 change instance for bookloader test -- old example no longer in Google Books 2013-02-18 09:17:15 -08:00
Raymond Yee a726a11154 [fix #41788889] google id for book changed 2012-12-31 10:10:24 -05:00
Raymond Yee 02dd7a55da Merge branch 'campaign_close' into charge_failed 2012-11-15 14:38:23 -08:00
Raymond Yee 03a751626e Stepping stone to tests that will allow the adjustment of localdatetime.now() so that we can simulate campaign closing 2012-11-15 14:37:04 -08:00
Raymond Yee 96b62aa163 basic skeleton for test based on loading fixture
keep the signals for create userprofile, wishlist, and credit from firing if fixtures being loaded
2012-10-31 11:08:46 -07:00
eshellman 8cb4586f78 Merge pull request #20 from Gluejar/relaunch
Relaunch
2012-09-28 07:55:07 -07:00
Raymond Yee 800dc128ab Merge branch 'campaign_relaunch' into relaunch
Conflicts:
	frontend/templates/manage_campaign.html
2012-09-27 14:04:00 -07:00
eric e23d706469 Added tests for campaign.clone and Premiums 2012-09-25 16:43:25 -04:00
Andromeda Yelton e62484f46a whoops wrong edition 2012-09-25 12:27:39 -04:00
Andromeda Yelton 2e23ddfd54 with format icons now in download page link counts are different 2012-09-25 11:10:23 -04:00
Andromeda Yelton 756c1da430 download page test needs to cover readmill addition and new unglued flag handling 2012-09-19 12:37:37 -04:00
Andromeda Yelton 8c030df830 adding some tests for my recent commits hooray 2012-08-29 15:56:14 -04:00
Raymond Yee e76f30ed28 Lowering expected editiion and subject count for bookloader.add_by_googlebooks_id('c_dBPgAACAAJ') in the test 2012-07-30 08:23:38 -07:00
eric 12671ddcdf unpack openlibrary descriptions delivered as dicts [#33377581] 2012-07-26 12:07:16 -04:00
Raymond Yee 0c0b807385 Adjusting number of editions required from at least 20 to at least 15 for test to pass (latest count 18) 2012-07-23 07:22:14 -07:00
Raymond Yee 6c7e9594c0 [#33125113] Marking the language test for Cat's Eye as expected failure because I think Google has bad data for this work.
Worth looking at other books
2012-07-20 09:28:14 -07:00
Raymond Yee 9a985176bc Fixed problems in tests stemming from an edition of Neuromancer no longer in Google Books -- switched to another one
We still have issues about language of editions for Cat's Cradle
2012-07-20 08:40:11 -07:00
eric e9e9ee135b expect the test to succeed again 2012-06-21 23:20:57 -04:00
Raymond Yee ea4fc308a0 Allowing campaign.update_status to go SUCCESSFUL w/o regard to specific deadline.
Set a bookloader test to expected failure while it might be a transient error
2012-06-20 15:48:55 -07:00
Raymond Yee 1f77371b7b 1) the title of ISBN:9780226032030 changed from 'Forbidden journeys' to 'Forbidden Journeys'
2) using humanize tag naturalday on the book panel
2012-06-18 13:55:45 -07:00
eric 1bb459e71d resolve test conficts 2012-05-25 14:54:08 -04:00
eric 8ca9b7900c [start #28494261] "official" notification get sent by email too wishers by default. needs syncdb 2012-05-25 14:52:50 -04:00
eshellman b3610e17f3 added hard updates of campaign objects 2012-05-25 13:52:25 -03:00
eshellman a77d2e3fea The campaign setup for test_merge_works was wrong but fixing it causes the test to fail on my machine and I cannot fathom why. Fixing it directly on github to make sure I haven't done something else stupid. 2012-05-25 13:03:23 -03:00
Andromeda Yelton a830d5af48 eric wanted me to write a test so I did. tests percent_of_goal 2012-05-22 11:07:05 -04:00
eric c61bc9985d test for factored license url [#29884981] 2012-05-20 00:12:16 -04:00
Raymond Yee 9b2693ed8b [#29272807] Implementation of an encrypted keystore as core.models.Key
NOTE MIGRATION needed

* Immediate reason for this implementation is to make it harder for our AWS keys to be compromised -- this will allow us to store them in encrypted (AES 256) form in the db, which will require ability to run mysql on the EC2 instance
* depends on a Django settings.SECRET_KEY, which for now, we might store in settings/local.py -- we could get fancier about how to serve that up
2012-05-08 16:08:36 -07:00
eric a32b09a4cb Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration""
This reverts commit 2d344a09c6.
2012-05-07 01:18:11 -04:00
eric c0cb99e040 Revert "Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration"""
This reverts commit c8be251ffa.
2012-05-07 01:18:11 -04:00
eric d334fa58b0 Revert "Revert "Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration""""
This reverts commit b21787a590.
2012-05-07 01:18:11 -04:00
eric e10136f1b2 Revert "Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration"""
This reverts commit 1bbac102a2.
2012-05-07 01:18:11 -04:00
eric 1bbac102a2 Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration""
This reverts commit 2d344a09c6.
2012-05-07 01:14:47 -04:00
eric b21787a590 Revert "Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration"""
This reverts commit c8be251ffa.
2012-05-07 01:14:47 -04:00
eric c8be251ffa Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration""
This reverts commit 2d344a09c6.
2012-05-07 01:14:01 -04:00