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
5a7a2dd27a
Merge pull request #232 from Gluejar/acq_admin
...
add Acq to admin system [#59972686 ] -> Se test ok; pass to Jenkins
2013-11-08 07:56:35 -08:00
275f299f81
campaign setup cleanup: was broken when more than one claim existed
2013-11-07 13:35:35 -05:00
e6692f7932
This was causing reserved licenses to be immediately borrowed
2013-11-07 13:32:00 -05:00
2d86584129
add Acq to admin system
2013-11-06 23:25:52 -05:00
f756b6a2d6
Merge branch 'master' of github.com:Gluejar/regluit
2013-11-06 16:26:32 -08:00
520fef9f18
set emails in fixtures to avoid test failures on notification
2013-11-06 19:19:18 -05:00
acf346c191
Merge pull request #231 from Gluejar/b2u_cleanup
...
B2u cleanup
2013-11-06 15:39:44 -08:00
50134907cd
also want tests to pass
2013-11-06 17:20:13 -05:00
f5f58dfba6
don't want tests to generate email
2013-11-06 15:43:54 -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
499378ccf7
improve bad epub error handling
2013-11-05 00:57:15 -05:00
31512d36b0
Merge pull request #230 from Gluejar/b2u_assorted
...
B2u assorted
2013-11-04 10:34:08 -08:00
1944f1dd9e
Address AM 11/4 comments
2013-11-04 13:24:43 -05:00
f6f3c4fc04
booxtream default ex libraris page boasts about "Social DRM". yuck.
2013-11-03 17:19:23 -05:00
757927220e
this is what caused "Open Access" to fail for Raymond last week.
2013-11-03 17:14:13 -05:00
255c2ac5c3
Merge pull request #229 from Gluejar/b2u_template_updates
...
B2u template updates
2013-11-03 07:13:01 -08: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
ea370a22f9
Merge pull request #228 from Gluejar/b2u_multiple_copies
...
B2u multiple copies
2013-11-01 14:20:10 -07: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
852cfab346
Merge pull request #227 from Gluejar/IPauth_32bit
...
ip pauth 32bit
2013-10-31 16:44:28 -07:00
7454101dd4
remove code that forbids overlapping blocks
2013-10-31 18:10:01 -04:00
78d7f1291a
use longs, not ints
2013-10-31 18:00:58 -04:00
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
c79572e8e4
notifications when user joins library or user borrows a book
2013-10-31 12:26:43 -04:00
a69f4aa35e
Merge pull request #224 from Gluejar/tidy_logs
...
turned off requests logging from bookloader [#59784776 ]
2013-10-30 15:42:58 -07:00
0d103f2768
Merge pull request #225 from Gluejar/library_inserted_page
...
added cases for library licenses
2013-10-30 14:55:14 -07:00
d740d98e51
turned off requests logging from bookloader
...
the messages from requests were more than useful
2013-10-30 12:42:59 -04:00
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
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
775aa61acb
Merge pull request #222 from Gluejar/library_users_list
...
list of library users
2013-10-29 14:09:16 -07: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
53d9f2c8be
library ungluer list is library members
2013-10-19 21:01:10 -04:00
76562f83ad
fix test errors
2013-10-19 17:27:53 -04:00
cc8375bf4a
bookpanel reflects in-library and out on loan state
2013-10-19 16:54:09 -04:00
6e7344d8a4
and now, you can borrow a library book! yay!
2013-10-18 15:35:48 -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
Raymond Yee
eric