Commit Graph

2144 Commits (f5d97bcbfc9cca999b7092b6797cacde6b7af173)

Author SHA1 Message Date
eric 510f0a2d41 added docracy links 2013-11-12 11:35:12 -05:00
eric 1713a9fbb2 prettier 2013-11-11 14:09:41 -05:00
eric 264c7c9946 didn't have a template for a failed email-change 2013-11-11 14:01:40 -05:00
eric 4582537f05 add onhover explainers to ungluing date and amount to go
on work and purchase pages
2013-11-09 20:34:13 -05:00
eric 00693f7a23 Merge branch 'master' into reserves
Conflicts:
	core/models.py
2013-11-08 16:07:29 -05:00
eric e5a9b5384f change alert messages 2013-11-08 13:38:07 -05:00
eric b14122613e fix tests 2013-11-08 12:49:22 -05:00
eric 0840a1fd71 implement holds. Also fix borrow view that didn't specify work. 2013-11-08 12:13:34 -05:00
Raymond Yee fe17499af8 Merge pull request #233 from Gluejar/epub_errors
improve bad epub error handling -- Se test runs -- passing to Jenkins
2013-11-08 08:20:19 -08:00
eric 275f299f81 campaign setup cleanup: was broken when more than one claim existed 2013-11-07 13:35:35 -05:00
eric e6692f7932 This was causing reserved licenses to be immediately borrowed 2013-11-07 13:32:00 -05:00
eric 30f7f2c4ba Raymond's editis 2013-11-06 15:34:11 -05:00
eric 43ea692802 It turns out that "congratulations" triggers spam filters 2013-11-06 15:22:30 -05:00
eric ca540c4cb4 wired up claim notifications [#37257639] 2013-11-06 14:58:50 -05:00
eric 499378ccf7 improve bad epub error handling 2013-11-05 00:57:15 -05:00
eric 1944f1dd9e Address AM 11/4 comments 2013-11-04 13:24:43 -05:00
eric dd84c36418 subsume calculator view into faq view 2013-11-03 00:27:52 -04:00
eric b5db02e1d0 incorporate AM suggestions into FAQs 2013-11-03 00:07:52 -04:00
eric ebea84427a repeated "visited the" typo 2013-11-02 15:31:28 -04:00
eric 0f38e35368 no empty-list slideshows on library page 2013-11-02 13:31:39 -04:00
eric f1a5a89ba7 update purchase notification to indicate multiple copies 2013-11-01 16:32:10 -04: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 143b24c368 acquired ebooks failed to show if wishlist empty [#59972462]
some complicated interaction with wishlists because this template
copies a user's
2013-11-01 14:33:52 -04:00
eric 6ce980810e library_join notification to library should differ from not to user 2013-11-01 14:30:41 -04:00
eric c79572e8e4 notifications when user joins library or user borrows a book 2013-10-31 12:26:43 -04:00
Raymond Yee 0d103f2768 Merge pull request #225 from Gluejar/library_inserted_page
added cases for library licenses
2013-10-30 14:55:14 -07:00
eric 75ef87a11a added cases for library licenses 2013-10-30 11:44:02 -04:00
eric a73e62f5d0 add links to calculator 2013-10-30 09:53:02 -04:00
eric 2f8d4bc0c4 [finish #59785084] review campaign instructions 2013-10-30 09:12:04 -04:00
eric 7254dcd55e list of library users
visible to other library users and unglue.it staff
2013-10-27 13:15:18 -04:00
Raymond Yee eacb801af9 Merge pull request #221 from Gluejar/add_libraries
Add libraries
2013-10-22 16:02:26 -07:00
eric 0d81e22ff1 add "reserve" to purchase page 2013-10-20 14:18:17 -04:00
eric 53d9f2c8be library ungluer list is library members 2013-10-19 21:01:10 -04:00
eric 76562f83ad fix test errors 2013-10-19 17:27:53 -04:00
eric cc8375bf4a bookpanel reflects in-library and out on loan state 2013-10-19 16:54:09 -04:00
eric 6e7344d8a4 and now, you can borrow a library book! yay! 2013-10-18 15:35:48 -04:00
eric 60cd2f626b borrowability reflected on work page 2013-10-18 13:33:47 -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 90e1e56405 <pre> section was causing width overflow, added calculator link 2013-10-17 08:39:21 -04:00
eric b9b5f9e389 download changes a reserve to a borrow 2013-10-16 22:53:47 -04:00
eric c2649f6ab2 implemented borrowing methods, "BORROWED" license acq, RESERVES
includes a schema migration!
2013-10-16 22:48:29 -04:00
eric e6573ac0c5 library user can buy a library license 2013-10-15 16:18:30 -04:00
eric 99c7b73d4a purchase page reflects library membership and purchased status 2013-10-14 22:51:48 -04:00
eric 4710c5d413 Merge branch 'master' into add_libraries 2013-10-14 18:20:14 -04:00
eric 6e5eab447c whoops! more tou changes 2013-10-14 13:43:08 -04:00
eric 882feda6c3 now reviewed by attorney 2013-10-14 11:22:42 -04:00
eric b1d8b2338a list of unlguit libraries at libraryauth/list/ 2013-10-12 22:39:47 -04:00
eric c552057291 comments page gets some small tweaks
Going to use this page as a model for the library list.
2013-10-12 20:31:05 -04:00
eric 29d000b39b fix test for libraries 2013-10-12 19:14:17 -04:00
eric 157d41eead make the purchase options reflect user libraries 2013-10-11 17:50:54 -04:00
eric a57fa7e822 one more nit 2013-10-11 15:19:56 -04:00
eric fcc1876859 Revisit manage_campaign page for b2u 2013-10-11 12:50:59 -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 56a4856080 wording tweak 2013-10-07 12:35:26 -04:00
eric ec7a3155b2 exclude incomplete transactions from event display on landing page 2013-10-05 11:41:12 -04:00
eric 19101a3109 ungluing date calculator and many documetation improvements 2013-10-03 22:54:25 -04:00
eric 076ce51efd draft of revised TOU 2013-10-02 17:21:22 -04:00
eric b7393e7825 change copyright notice per lawyer 2013-10-02 12:09:26 -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 6b5dbc16c0 we haven't used some info and will have better conversion as we ask for less info 2013-09-27 14:03:01 -04:00
eric 0d14b9ac3e mis-spellings, we're not selling pdf yet 2013-09-27 14:01:10 -04:00
eric b091612605 Merge branch 'master' into b2u_errata
Conflicts:
	frontend/views.py (kindle config bug already fixed)
2013-09-26 09:57:06 -04:00
eric 93b7ffc951 Improve language on campaign pages, make text bigger 2013-09-26 09:49:39 -04:00
eric 5976803cb4 fix bug in kindle config, improve doumentation 2013-09-26 09:36:03 -04:00
eric 9b5a254f1d Adapt marc record machinery to B2U titles 2013-09-23 12:39:47 -04:00
eric 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
eric 99fe9f9011 rewrite license page 2013-09-20 17:46:06 -04:00
eric ed341884ea add license page to epub before sending it for watermarking 2013-09-15 21:43:58 -04:00
eric 2e58255e6c readmill downloads can't have mixed redirects 2013-09-11 11:31:20 -04:00
eric 4038ea53e7 fix Kindle_config 404 2013-09-09 15:48:27 -04:00
eric 4509cea6dd only 2 o's in ebook 2013-09-09 15:20:58 -04:00
Raymond Yee 2329f9b088 Merge branch 'master' into preview_pledge 2013-09-09 08:32:56 -07:00
Raymond Yee 2b11153fc6 Merge pull request #205 from Gluejar/messages_notices
Notices, not Messages
2013-09-09 08:30:38 -07:00
eric 63f0ee3794 Remove pledge form error when campaign is not active. [#56565596] 2013-09-09 09:54:16 -04:00
eric de17f02298 [#56528504] fixed lanfing page for purchases 2013-09-06 22:19:46 -04:00
eric f98684e1f8 Notices, not Messages
A review of the entire site reveals that we use "Messages" in only one
place, the sitewide menu item leading to the notices page. Most of our
Notices are more acurately described as notices than as messages, so
will change the menu item.
2013-09-06 16:06:10 -04:00
eric 4b3c899088 [#55666760] make fund-complete page sensetive to action 2013-09-06 13:58:23 -04:00
eric 6294c15aad TGFT 2013-09-06 00:14:06 -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 5bb359fb1e safe_get_work not used everywhere it should have been 2013-09-05 16:14:51 -04:00
eric 0ba5c9a00e cleanup, plus tests 2013-08-27 18:03:35 -04:00
eric e51fa1190e wired watermarker into file uploads. migration needed 2013-08-26 23:56:01 -04:00
eric e5a162061d only epub files to be uploaded for now 2013-08-26 23:54:19 -04:00
eric cbc34db3d7 fix bug found by luc 2013-08-22 16:12:27 -04:00
eric 1c33c34f21 purchase complete notification, contextual wishlist active, fulfillment in signal handler 2013-08-22 14:30:56 -04:00
eric 3bdb755419 move constant to params file to improve import 2013-08-22 14:22:54 -04:00
eric bec85ff82e 1st crack at faq revision 2013-08-20 14:11:11 -04:00
eric ff2d995cd5 minor wording changes 2013-08-20 12:41:39 -04:00
eric 159ad0db05 fix tests, fix bugs found by tests 2013-08-20 01:01:36 -04:00
eric 80d78e624f remove amazon cruft to get current_total correct 2013-08-19 23:23:27 -04:00
eric 18c836d6cd connect purchases to the new Acq table which records purchases 2013-08-19 22:54:43 -04:00
eric 91f7c5f23d Remove some payment dependence on campaign details 2013-08-19 22:52:22 -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 4a3cfc6840 Merge branch 'master' into ebook_selling 2013-08-18 18:11:13 -04:00
eric 94eb6aeab0 Demphasize "wishes" on the website in preparation for B2U 2013-08-18 18:10:25 -04:00
eric d5b9f88380 move "extra data" into a json field dict to improve payment code tidieness
need to install jsonfield
note: this is https://bitbucket.org/schinckel/django-jsonfield
I tried https://github.com/bradjasper/django-jsonfield but it was not
compatible with South
2013-08-18 15:21:55 -04:00
Raymond Yee c007df0803 Merge branch 'master' into social_auth_password 2013-08-17 17:41:15 -04:00