Commit Graph

174 Commits (30f7f2c4ba0fa353a62f6cc091bee90187370abf)

Author SHA1 Message Date
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
eric f2e6d10469 allow new edition id oclc but no isbn; allow new publishernames 2013-05-13 17:32:30 -04:00
Andromeda Yelton e7cea6c8f4 clarifying 2013-04-24 14:30:39 -04:00
eric 3c61e292d9 Fix edition editing, add other identifiers 2013-04-13 10:59:11 -04:00
Raymond Yee 2bb69d9e82 Merge pull request #149 from Gluejar/verify_email_change
Verify email change
2013-04-08 07:28:32 -07:00
eric fabc7e6802 merge from master again except views 2013-04-05 13:07:13 -04:00
Andromeda Yelton a7adca844e submitterator needs to allow us to submit past press coverage 2013-04-04 11:40:03 -04:00
Andromeda Yelton 57f7c81ec0 adds press item submission functionality 2013-04-04 11:09:18 -04:00
eric 097127ab7c resolve conficts in merge from master 2013-03-29 12:03:15 -04:00
eric 3a81db3804 Implement publisher and feedback email in campaign management
(feedback view made more flexible)
2013-03-27 12:22:30 -04:00
eric d905f288d7 merge from master 2013-03-22 16:45:41 -04:00
eric c26f9e1505 merge from master 2013-03-22 16:39:23 -04:00
eric a22e5e95e5 fix bad welcome page and login 2013-03-19 10:33:57 -04:00
eric 014f15d8ee start on the profile editor mods... 2013-03-14 21:42:00 -04:00
eric 28045aed77 merge master into improve_registration 2013-03-13 10:40:20 -04:00
eric 7bf62d665e rip out old password change code 2013-03-12 21:58:15 -04:00
eric cc2623e196 login form now remembers the username you picked [#23965785] 2013-03-12 14:26:40 -04:00
eric 282f877890 wire up msg view to wishlist_message notification [#36991391] 2013-02-26 12:43:54 -05:00
eric fec7f33d9e staff only UI for merging works [finish #39297681]
staff-only link in rights tab of every work!
2012-12-12 22:35:35 -05:00
eric bda3211a76 user can manage their account credit card [#37674369] 2012-10-14 23:41:17 -04:00