Commit Graph

4057 Commits (6ce980810eb1db7550752c3746e6847d818f3d50)

Author SHA1 Message Date
eric 6ce980810e library_join notification to library should differ from not to user 2013-11-01 14:30:41 -04:00
Raymond Yee b8150ad651 Merge pull request #226 from Gluejar/library_notifications
notifications when user joins library or user borrows a book [#59238164][#59238032]
2013-10-31 09:39:08 -07:00
eric c79572e8e4 notifications when user joins library or user borrows a book 2013-10-31 12:26:43 -04:00
Raymond Yee a69f4aa35e Merge pull request #224 from Gluejar/tidy_logs
turned off requests logging from bookloader   [#59784776]
2013-10-30 15:42:58 -07: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 d740d98e51 turned off requests logging from bookloader
the messages from requests were more than useful
2013-10-30 12:42:59 -04:00
Raymond Yee 34cb1473f2 Merge pull request #223 from Gluejar/campaign_instructions
[finish #59785084] review campaign instructions --> since we have HTML changes only, I'll do merge w/o first testing
2013-10-30 08:59:24 -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
Raymond Yee 775aa61acb Merge pull request #222 from Gluejar/library_users_list
list of library users
2013-10-29 14:09:16 -07: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
Raymond Yee 8cd2dcb136 Merge pull request #220 from Gluejar/tweak_terms
<pre> section was causing width overflow, added calculator link
2013-10-17 07:49:52 -07: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
Raymond Yee d3659dfb01 Merge pull request #219 from Gluejar/update_tou
whoops! more tou changes
2013-10-14 10:48:22 -07:00
eric 6e5eab447c whoops! more tou changes 2013-10-14 13:43:08 -04:00
Raymond Yee 100d72955c Merge pull request #218 from Gluejar/update_tou
now reviewed by attorney
2013-10-14 08:59:42 -07: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 13b4a028f1 remove unneeded file and fix typo in email_join 2013-10-12 22:11: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 c73ed19080 fix superlogin urlconfig 2013-10-11 17:24:06 -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 eb9cc878ce add email authentication 2013-10-10 22:31:31 -04:00
eric a4321ff6fc fix various bugs 2013-10-10 22:31:07 -04:00
eric 9929452ebc LibraryUser replaces LibraryCard, used for all backends, has datestamp 2013-10-10 15:56:40 -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
Raymond Yee 3799606cc5 Merge pull request #217 from Gluejar/fix_epub_noguide
fix pyepub addpart when epub has no guide [#58277304]
2013-10-07 06:14:06 -07:00
eric 30e5d6fc6e fix pyepub addpart when epub has no guide [#58277304] 2013-10-06 15:12:33 -04:00
Raymond Yee 4069c4e4a5 Merge pull request #216 from Gluejar/fix_event_display
exclude incomplete transactions from event display on landing page
2013-10-05 08:54:21 -07:00