2959b68549
Merge pull request #246 from Gluejar/b2u_ungluify
...
B2u ungluify
2013-11-15 15:59:05 -08:00
6787ccd5d8
faq: Why don't you use Paypal or Amazon?
2013-11-15 13:43:38 -05:00
47dd298a78
update campaign successful notifications
2013-11-15 12:06:06 -05:00
efea7d0198
on success, add a cc license, watermark (and generate mobi), and save
2013-11-14 23:16:55 -05:00
c6edd83884
Merge branch 'master' into b2u_ungluify
2013-11-14 14:58:22 -05:00
c5eee08034
edit wording
2013-11-14 14:58:02 -05:00
5d4539b305
enable ebookfile download and secure ebookfile storage
2013-11-14 14:48:16 -05:00
8bb514a401
somehow the "borrow" function wasn't tested in "reserves"
2013-11-12 17:28:07 -05:00
0875482611
Merge pull request #242 from Gluejar/library_agreement
...
added docracy links
2013-11-12 10:55:14 -08:00
dd5d1630b5
Merge pull request #238 from Gluejar/fix_email_change
...
didn't have a template for a failed email-change
2013-11-12 10:49:15 -08:00
510f0a2d41
added docracy links
2013-11-12 11:35:12 -05:00
1713a9fbb2
prettier
2013-11-11 14:09:41 -05:00
264c7c9946
didn't have a template for a failed email-change
2013-11-11 14:01:40 -05:00
4582537f05
add onhover explainers to ungluing date and amount to go
...
on work and purchase pages
2013-11-09 20:34:13 -05:00
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
b14122613e
fix tests
2013-11-08 12:49:22 -05:00
0840a1fd71
implement holds. Also fix borrow view that didn't specify work.
2013-11-08 12:13:34 -05:00
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
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
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
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
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
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
Raymond Yee
eric