00693f7a23
Merge branch 'master' into reserves
...
Conflicts:
core/models.py
2013-11-08 16:07:29 -05:00
e5a9b5384f
change alert messages
2013-11-08 13:38:07 -05:00
0840a1fd71
implement holds. Also fix borrow view that didn't specify work.
2013-11-08 12:13:34 -05:00
275f299f81
campaign setup cleanup: was broken when more than one claim existed
2013-11-07 13:35:35 -05:00
30f7f2c4ba
Raymond's editis
2013-11-06 15:34:11 -05:00
43ea692802
It turns out that "congratulations" triggers spam filters
2013-11-06 15:22:30 -05:00
ca540c4cb4
wired up claim notifications [ #37257639 ]
2013-11-06 14:58:50 -05:00
1944f1dd9e
Address AM 11/4 comments
2013-11-04 13:24:43 -05:00
dd84c36418
subsume calculator view into faq view
2013-11-03 00:27:52 -04:00
b5db02e1d0
incorporate AM suggestions into FAQs
2013-11-03 00:07:52 -04:00
ebea84427a
repeated "visited the" typo
2013-11-02 15:31:28 -04:00
0f38e35368
no empty-list slideshows on library page
2013-11-02 13:31:39 -04:00
f1a5a89ba7
update purchase notification to indicate multiple copies
2013-11-01 16:32:10 -04:00
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
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
6ce980810e
library_join notification to library should differ from not to user
2013-11-01 14:30:41 -04:00
c79572e8e4
notifications when user joins library or user borrows a book
2013-10-31 12:26:43 -04:00
0d103f2768
Merge pull request #225 from Gluejar/library_inserted_page
...
added cases for library licenses
2013-10-30 14:55:14 -07:00
75ef87a11a
added cases for library licenses
2013-10-30 11:44:02 -04:00
a73e62f5d0
add links to calculator
2013-10-30 09:53:02 -04:00
2f8d4bc0c4
[finish #59785084 ] review campaign instructions
2013-10-30 09:12:04 -04:00
7254dcd55e
list of library users
...
visible to other library users and unglue.it staff
2013-10-27 13:15:18 -04:00
eacb801af9
Merge pull request #221 from Gluejar/add_libraries
...
Add libraries
2013-10-22 16:02:26 -07:00
0d81e22ff1
add "reserve" to purchase page
2013-10-20 14:18:17 -04:00
cc8375bf4a
bookpanel reflects in-library and out on loan state
2013-10-19 16:54:09 -04:00
60cd2f626b
borrowability reflected on work page
2013-10-18 13:33:47 -04:00
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
6910f1aa0c
cleanup of supporter view
2013-10-17 12:44:47 -04:00
90e1e56405
<pre> section was causing width overflow, added calculator link
2013-10-17 08:39:21 -04:00
c2649f6ab2
implemented borrowing methods, "BORROWED" license acq, RESERVES
...
includes a schema migration!
2013-10-16 22:48:29 -04:00
e6573ac0c5
library user can buy a library license
2013-10-15 16:18:30 -04:00
99c7b73d4a
purchase page reflects library membership and purchased status
2013-10-14 22:51:48 -04:00
4710c5d413
Merge branch 'master' into add_libraries
2013-10-14 18:20:14 -04:00
6e5eab447c
whoops! more tou changes
2013-10-14 13:43:08 -04:00
882feda6c3
now reviewed by attorney
2013-10-14 11:22:42 -04:00
b1d8b2338a
list of unlguit libraries at libraryauth/list/
2013-10-12 22:39:47 -04:00
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
29d000b39b
fix test for libraries
2013-10-12 19:14:17 -04:00
157d41eead
make the purchase options reflect user libraries
2013-10-11 17:50:54 -04:00
a57fa7e822
one more nit
2013-10-11 15:19:56 -04:00
fcc1876859
Revisit manage_campaign page for b2u
2013-10-11 12:50:59 -04:00
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
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
2f703a7815
Merge branch 'master' into add_libraries
2013-10-07 12:35:55 -04:00
56a4856080
wording tweak
2013-10-07 12:35:26 -04:00
ec7a3155b2
exclude incomplete transactions from event display on landing page
2013-10-05 11:41:12 -04:00
19101a3109
ungluing date calculator and many documetation improvements
2013-10-03 22:54:25 -04:00
076ce51efd
draft of revised TOU
2013-10-02 17:21:22 -04:00
b7393e7825
change copyright notice per lawyer
2013-10-02 12:09:26 -04:00
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
Raymond Yee