eb416e75dd
Merge branch 'master' into switch_watermarking
2013-12-19 18:02:43 -05:00
973d2c3bc0
made watermarking optional [ #62120182 ]
...
apply migrations
2013-12-18 12:34:53 -05:00
0d28fbab7e
Merge branch 'master' into ban_disposable_emails
2013-12-18 08:54:11 -08:00
098b185a5a
turn off mailchimp checking for tests
2013-12-16 15:11:25 -05:00
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
e014114a52
preclude possible inter-instance data leakage
2013-11-18 18:22:09 -05:00
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
a701edf3b2
make ebook entries yay
2013-11-15 02:10:14 -05:00
efea7d0198
on success, add a cc license, watermark (and generate mobi), and save
2013-11-14 23:16:55 -05:00
5d4539b305
enable ebookfile download and secure ebookfile storage
2013-11-14 14:48:16 -05:00
9cf7385324
move campaign completion logic to campaign
2013-11-14 12:40:01 -05:00
0dad79a3d4
fix bug comparing dates with times
2013-11-14 12:38:58 -05:00
e4b3d387fe
correct documentation notes
2013-11-12 14:58:29 -05:00
2786b871d3
update status now works for b2u
2013-11-12 14:48:04 -05:00
ffd6796bfd
fix silly method of turning off notifications
2013-11-10 10:28:22 -05:00
00693f7a23
Merge branch 'master' into reserves
...
Conflicts:
core/models.py
2013-11-08 16:07:29 -05:00
0840a1fd71
implement holds. Also fix borrow view that didn't specify work.
2013-11-08 12:13:34 -05:00
2d86584129
add Acq to admin system
2013-11-06 23:25:52 -05:00
50134907cd
also want tests to pass
2013-11-06 17:20:13 -05:00
f5f58dfba6
don't want tests to generate email
2013-11-06 15:43:54 -05:00
ca540c4cb4
wired up claim notifications [ #37257639 ]
2013-11-06 14:58:50 -05:00
f6f3c4fc04
booxtream default ex libraris page boasts about "Social DRM". yuck.
2013-11-03 17:19:23 -05:00
757927220e
this is what caused "Open Access" to fail for Raymond last week.
2013-11-03 17:14:13 -05:00
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
c79572e8e4
notifications when user joins library or user borrows a book
2013-10-31 12:26:43 -04:00
76562f83ad
fix test errors
2013-10-19 17:27:53 -04:00
cc8375bf4a
bookpanel reflects in-library and out on loan state
2013-10-19 16:54:09 -04:00
6e7344d8a4
and now, you can borrow a library book! yay!
2013-10-18 15:35:48 -04:00
60cd2f626b
borrowability reflected on work page
2013-10-18 13:33:47 -04:00
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
c2649f6ab2
implemented borrowing methods, "BORROWED" license acq, RESERVES
...
includes a schema migration!
2013-10-16 22:48:29 -04:00
157d41eead
make the purchase options reflect user libraries
2013-10-11 17:50:54 -04:00
fcc1876859
Revisit manage_campaign page for b2u
2013-10-11 12:50:59 -04:00
d99aaa97c9
card number authentication!
...
create libraries and administer them in admin.
card patterns mimc ezproxy format
http://www.oclc.org/support/services/ezproxy/documentation/usr/number.en
.html
after you join a library, it appears in your explore bar
2013-10-10 02:41:50 -04:00
19101a3109
ungluing date calculator and many documetation improvements
2013-10-03 22:54:25 -04:00
b091612605
Merge branch 'master' into b2u_errata
...
Conflicts:
frontend/views.py (kindle config bug already fixed)
2013-09-26 09:57:06 -04:00
58755d76e1
fix dollar per day computation to use launch date when present
...
also, activated had never been activated!
2013-09-26 09:26:50 -04:00
9b5a254f1d
Adapt marc record machinery to B2U titles
2013-09-23 12:39:47 -04:00
be711e142d
cleaned up marc file storage issues before implementing b2u
...
MIGRATION!
1. multi-record marc files no longer saved, sent to user directly
2. works with both s3 and file system- default storage by name used for
both read and write.
3. stupid storage of computed filenames/urls eliminated
4. removed verbose logging
5. no need to have pymarc write to a StringIO
6. the MARCRecord.clean method didn't do anything
2013-09-23 00:34:51 -04:00
99fe9f9011
rewrite license page
2013-09-20 17:46:06 -04:00
c83f1f657d
remove more debugging stuff
2013-09-20 17:45:28 -04:00
ed341884ea
add license page to epub before sending it for watermarking
2013-09-15 21:43:58 -04:00
aad6d72207
Merge branch 'master' into b2u_download
...
Conflicts:
core/signals.py
2013-09-05 22:56:46 -04:00
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
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
0ba5c9a00e
cleanup, plus tests
2013-08-27 18:03:35 -04:00
e51fa1190e
wired watermarker into file uploads. migration needed
2013-08-26 23:56:01 -04:00
567f20d5a2
move more constants
2013-08-25 23:52:09 -04:00
f93fe51e29
days_per_copy properties
2013-08-22 14:23:47 -04:00
3bdb755419
move constant to params file to improve import
2013-08-22 14:22:54 -04:00
Raymond Yee
eric