Commit Graph

174 Commits (5b9b28df3da046138fe7a7defa2ea18fa7687ec3)

Author SHA1 Message Date
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