Commit Graph

193 Commits (8d6453bc5d6a69fc218fe83f49df518119f8bd28)

Author SHA1 Message Date
eric b7e4b6defe can't thank the author with None
The thought originally was the user could enter 0. But that's not how
we're doing it
2014-05-19 12:09:47 -04:00
eric fd896c8916 Merge branch 'improve_t4u_campaign' into improve_editions 2014-03-12 18:08:54 -04:00
eric d2dd926f80 let campaign manager edit work description in campaign management
also, revise documentation for campaigns
2014-03-12 18:03:50 -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
Raymond Yee 256c60fbfc Merge branch 'master' into t4u_download
Conflicts:
	core/models.py
2014-03-03 11:08:50 -08:00
eric e72f55f919 it turns out that offer editing didn't quite work 2014-02-25 14:29:54 -05:00
eric b5fd630bfc Thanks mostly works. 2014-02-19 22:18:23 -05:00
eric 3a47d24136 use pyepub to test epubs
also indentation style
2014-02-05 18:23:06 -05:00
eric f8df2507ee add checker for mobi 2014-02-05 18:17:26 -05:00
eric ba3c85d8ac Merge branch 'master' into t4u_file_upload 2014-02-04 13:14:20 -05:00
eric 4948a7961f Upload for T4U is fixed 2014-01-31 15:45:02 -05:00
eric ca4471ff55 added cover upload 2014-01-30 23:16:06 -05:00
eric 66ca501327 temp commit 2014-01-15 08:32:55 -05:00
eric 9949a53da3 Use named campaign types 2014-01-10 14:51:59 -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
eric 073e9664c0 fix test for ISBN 2013-12-27 16:35:23 -05:00
eric 4927801a77 fix bug in OpenCampaign
I had added a prefix to this form, neglected thorough testing, did
better testing this time.
2013-12-18 13:02:57 -05:00
eric 973d2c3bc0 made watermarking optional [#62120182]
apply migrations
2013-12-18 12:34:53 -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 e6573ac0c5 library user can buy a library license 2013-10-15 16:18:30 -04:00
eric fcc1876859 Revisit manage_campaign page for b2u 2013-10-11 12:50:59 -04:00
eric 439169a1ab Implemented IP authentication
libraries get associated with a library_block table (IP ranges)
moved superlogin here
IP stuff mostly copied from
https://github.com/benliles/django-ipauth/blob/master/ipauth/models.py
The model is that you need to be in an allowed IP range to "join" a
library. Once you've joined, you can use your login from anywhere. to
use that library.
Asign IP ranges in admin
2013-10-08 15:37:22 -04:00
eric 19101a3109 ungluing date calculator and many documetation improvements 2013-10-03 22:54:25 -04:00
eric 4b3c899088 [#55666760] make fund-complete page sensetive to action 2013-09-06 13:58:23 -04:00
eric e5a162061d only epub files to be uploaded for now 2013-08-26 23:54:19 -04:00
eric 18c836d6cd connect purchases to the new Acq table which records purchases 2013-08-19 22:54:43 -04:00
eric 837de35375 selling now works up to purchase page 2013-08-16 15:49:44 -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 e64c128f7e Merge branch 'master' into ebook_selling
Conflicts:
	frontend/forms.py
2013-08-08 19:59:29 -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 69f9e1838f harmonization with master for merge 2013-08-08 18:21:33 -04:00
eric eff880ce0b get license from database, not from the record submitter 2013-07-26 19:52:15 -04:00
eric 91e2d41b67 moved the link target pref into a library prefs only table 2013-07-26 18:30:45 -04:00
Andromeda Yelton 3a9e588fc7 replacing confusing field names 2013-07-25 10:18:36 -04:00
Andromeda Yelton bb5c1079b6 user can now change marc preferences 2013-07-23 12:23:04 -04:00
Andromeda Yelton 287f017551 documentation for CC/PD MARC records 2013-07-22 14:23:59 -04:00
eric 1bebec42af what about public domain ebooks? 2013-07-19 13:13:53 -04:00
Andromeda Yelton 516c8c768a I can harvest files from the db instead of tempting error by entering them twice 2013-07-18 16:36:01 -04:00
Andromeda Yelton 54e422e217 parametrizing formats and license choices, bugfixing 2013-07-17 13:03:35 -04:00
Andromeda Yelton 87c27cecee wiring ungluify_record to front end and s3 2013-07-17 10:34:01 -04:00
Andromeda Yelton fe2e3b72c5 argh 2013-07-16 11:42:17 -04:00
Andromeda Yelton e3b6288e23 iterating unglify script, starting to integrate into front end 2013-07-15 16:35:41 -04: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 f4ffd5da6f Merge branch 'master' into simpler_download 2013-06-04 10:48:49 -04:00
eric dd72b0d997 add the downoad_count to form exclude 2013-06-03 16:23:21 -04:00
Andromeda Yelton ad69580b2d PEP 8, PEP 328. I feel better now. 2013-06-03 12:31:39 -04:00
Andromeda Yelton 236302342e users can add and change kindle email 2013-05-31 15:19:58 -04:00