Commit Graph

167 Commits (3ad4427f55e361a81c0c6f0a8d25e926f6adf58e)

Author SHA1 Message Date
eric b8c7b8afa7 add a page that lets rhs see the premiums earned by ungluers 2013-12-30 21:51:32 -05:00
eric 706a0d1fc6 A list just for creative commons 2013-12-25 19:38:18 -05:00
eric 2892a22824 change terminology from "donation" to "gift" 2013-12-13 15:15:35 -05:00
eric 5d4539b305 enable ebookfile download and secure ebookfile storage 2013-11-14 14:48:16 -05:00
eric 0840a1fd71 implement holds. Also fix borrow view that didn't specify work. 2013-11-08 12:13:34 -05:00
eric dd84c36418 subsume calculator view into faq view 2013-11-03 00:27:52 -04:00
eric cc8375bf4a bookpanel reflects in-library and out on loan state 2013-10-19 16:54:09 -04: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 6910f1aa0c cleanup of supporter view 2013-10-17 12:44:47 -04:00
eric e6573ac0c5 library user can buy a library license 2013-10-15 16:18:30 -04:00
eric 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
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 2f703a7815 Merge branch 'master' into add_libraries 2013-10-07 12:35:55 -04:00
eric 19101a3109 ungluing date calculator and many documetation improvements 2013-10-03 22:54:25 -04:00
eric ab473f5411 libraries, phase 1.
admin can create a library connected to a user
other users can "join" the library
2013-10-02 12:02:08 -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
eric 91f7c5f23d Remove some payment dependence on campaign details 2013-08-19 22:52:22 -04:00
eric e64c128f7e Merge branch 'master' into ebook_selling
Conflicts:
	frontend/forms.py
2013-08-08 19:59:29 -04:00
eric a5cc59d6f9 filter marc records based on a user's wishlist 2013-07-29 17:59:52 -04:00
Andromeda Yelton da08afd0b8 now users can select the MARC records they want and get as single download 2013-07-24 14:52:01 -04:00
Andromeda Yelton bb5c1079b6 user can now change marc preferences 2013-07-23 12:23:04 -04:00
Andromeda Yelton e3b6288e23 iterating unglify script, starting to integrate into front end 2013-07-15 16:35:41 -04:00
Andromeda Yelton 214467e8f1 display available MARC records 2013-07-08 11:14:09 -04: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
eric b0f4eda221 show offers on work page 2013-06-27 13:10:33 -04:00
Andromeda Yelton 69f0451bea segregate flows of one-click and information-seeking options, address feedback 2013-06-24 13:53:28 -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
Andromeda Yelton b23b617e4b prompt not-logged-in users for kindle delivery email 2013-06-07 10:19:06 -04:00
Andromeda Yelton 2f3f8997ad make sure graceful degradation works, fix bugs 2013-06-05 11:06:07 -04:00
Andromeda Yelton ad69580b2d PEP 8, PEP 328. I feel better now. 2013-06-03 12:31:39 -04:00
Andromeda Yelton b3181f0e22 first pass at sending kindle files as attachments 2013-05-31 17:15:22 -04:00
Andromeda Yelton e75a7b9642 skeleton of send-to-kindle support 2013-05-31 11:34:51 -04:00
thatandromeda babeb9e4aa Merge pull request #164 from Gluejar/manage_book_data
Manage book data
2013-04-24 11:31:07 -07:00
eric 08d4adf50b implement adromeda suggestions 2013-04-24 11:14:25 -04:00
eric de442c8f63 count downloads. migrate schemas! 2013-04-20 00:02:36 -04:00
eric 31a1f46666 add split works funtionality 2013-04-16 16:46:25 -04:00
Andromeda Yelton 71306108b0 point press page at new version, tidy up submitterator 2013-04-08 14:16:08 -04:00
Andromeda Yelton 57f7c81ec0 adds press item submission functionality 2013-04-04 11:09:18 -04:00
Andromeda Yelton db0a967963 new press template and view 2013-04-04 10:15:29 -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 1881660089 intoduce Publisher and PublisherName Models
Also change our by publisher lists to key on the new name ids rather
than the names, which was yucky.
Migrations!
Data migration takes a while, don't be allarmed if it sits a while.
2013-03-25 23:41:19 -04:00
eric a5a000ef7f triple sign-in form when non-logged-in user tries to pledge 2013-03-21 14:24:11 -04:00
eric 28045aed77 merge master into improve_registration 2013-03-13 10:40:20 -04:00
thatandromeda 7dc1f4cba3 Merge pull request #129 from Gluejar/manager_supporter_msgs
Managers and staff can send messages to supporters [#36991391]
2013-03-12 11:52:43 -07:00
eric 80536a491a superlogin- failed logins check for socialauth and if so, as user to use it
superlogin injects extra_context into regular login method
2013-03-07 21:48:56 -05:00
Raymond Yee 14174ecb17 Merge pull request #135 from Gluejar/list_by_a_publisher
publisher name can now have a "/" in it. (changed URLs)
2013-03-06 10:22:32 -08:00
eric 760cbe70cf publisher name can now have a "/" in it. (changed URLs) 2013-03-06 12:45:27 -05:00
Raymond Yee 8759dad546 Merge pull request #133 from Gluejar/list_by_a_publisher
basic by-publisher list [#45617641]
2013-03-06 08:37:18 -08:00
eric 06b43ed8d1 basic by-publisher list [#45617641]
a bit slow, but that's a separate issue.
Not conspicuously surfaces yet, look at the links in the editions list
in rights tab.
2013-03-05 16:18:54 -05:00
eric 14a6803b9f mailchimp integration [finish #37732465]
need to pip install postmonkey
2013-03-04 17:01:33 -05:00