440153f5dc
Merge branch 'master' into test_credit
2013-12-15 01:27:59 -05:00
b331866c38
fix test
2013-12-15 01:26:42 -05:00
82443593ea
make zeros show
2013-12-15 00:46:50 -05:00
1598f181d8
assorted updates
2013-12-15 00:31:43 -05:00
40e611bac5
revive the gift/donation credit funtionality, at least for b2u campaigns
...
The reason for doing this is so a library can put in money with one
check, then use it up gradually. (we get to pocket the fees that would
go to stripe) One change here- in b2u there is an extra click to get to
download page, even if no gift credit is involved - this way the user
knows what and how he's bee charged
2013-12-15 00:31:06 -05:00
4d1bd51406
add a simple tag to convert a library id into a name
2013-12-15 00:24:04 -05:00
223c005b86
simplify and update slideshow
2013-12-14 13:24:29 -05:00
19a5da7268
Merge pull request #262 from Gluejar/fix_library_list
...
moved library list generation into a template tag
2013-12-13 14:18:13 -08:00
2892a22824
change terminology from "donation" to "gift"
2013-12-13 15:15:35 -05:00
8c974ca343
moved library list generation into a template tag
...
previously, if you created or updated a library, the list
(/libraryauth/list/ )would not get updated
2013-12-13 14:25:18 -05:00
8091ba1846
Merge pull request #261 from Gluejar/libraries_nits
...
Libraries nits
2013-12-12 07:56:45 -08:00
4836c6f8df
add info
2013-12-12 10:52:42 -05:00
c7e1d6a674
fix typo
2013-12-12 10:27:33 -05:00
9fce1c5f15
Merge pull request #260 from Gluejar/stupid_robots
...
https://ahrefs.com/robot/ got stuck in our site.
2013-12-11 11:11:15 -08:00
9440f88d67
https://ahrefs.com/robot/ got stuck in our site.
2013-12-11 11:52:48 -05:00
2e0e282765
Merge pull request #259 from Gluejar/make_test_book_conditional
...
Make core.BookLoaderTests.test_ebook check the ebooks only if they show ...
2013-12-10 16:34:00 -08:00
be080223bd
Make core.BookLoaderTests.test_ebook check the ebooks only if they show up...the public domain status of book fluctuates.
2013-12-10 16:17:12 -08:00
1ff10f1a2c
Merge pull request #258 from Gluejar/jenkins_gbooks_api_key
...
registered a new Google Books API for jenkins under rdhyee@gluejar.com account
2013-12-10 14:49:41 -08:00
854bc28612
registered a new Google Books API for jenkins under rdhyee@gluejar.com account
2013-12-10 14:48:04 -08:00
505a051e8d
Merge pull request #257 from Gluejar/update_csr_sh
...
update script for our current use of *.unglue.it cert
2013-12-09 15:33:51 -08:00
84b4e3274b
update script for our current use of *.unglue.it cert
2013-12-09 15:32:08 -08:00
314a8d6eb4
Merge pull request #256 from Gluejar/creat_library
...
ask user to sign in before showing them library validation --> ok let's merge to try out on just
2013-12-03 14:07:45 -08:00
4d2f2b4fed
ask user to sign in before showing them library validation
2013-12-03 13:50:12 -05:00
a7db1790e7
Merge pull request #255 from Gluejar/creat_library
...
Create library
2013-12-03 08:28:26 -08:00
79ea81a5e1
fix problem created by refactor
2013-12-02 18:19:11 -05:00
02103a8a29
show approval status
2013-12-02 10:28:58 -05:00
b1e1b9ff5d
clean up migration
2013-12-02 10:21:29 -05:00
8b53581169
clean up instructions
2013-12-02 10:12:22 -05:00
e6723bd54b
Merge pull request #254 from Gluejar/stealth_mountain
...
spelling correction
2013-12-02 06:29:51 -08:00
45d96f21bc
Add explanation of verification options
2013-12-02 00:46:25 -05:00
ddc681321d
refactor backends into classes
2013-12-01 23:58:58 -05:00
8a9b29946c
spelling correction
2013-12-01 19:42:19 -05:00
36df27cbc2
surface admin links
2013-12-01 19:22:42 -05:00
92aee28538
users can't join unapproved libraries
2013-12-01 19:20:42 -05:00
54deeea910
tweak the admin
2013-11-30 15:41:05 -05:00
ff0f7e5446
can now create and admin user validation
2013-11-30 15:40:45 -05:00
a3a1853a3b
fix test
2013-11-29 16:04:22 -05:00
ccb1f0dd86
create and edit Library objects, which now have names and owners
2013-11-27 22:14:52 -05:00
bb3916a2ca
Merge pull request #253 from Gluejar/fix_reserve_notice
...
Add missing {{ acq.work.title }} to library_reserve/full.txt
2013-11-27 11:17:54 -08:00
42694299e5
Add missing {{ acq.work.title }} to library_reserve/full.txt
2013-11-26 16:53:26 -08:00
19179f695d
Merge pull request #252 from Gluejar/denied_cc
...
Denied cc [finish #61351358 ]
2013-11-25 11:55:21 -08:00
6539370e37
remove commented code
2013-11-25 13:37:15 -05:00
af553056e8
update pledge_failed notices
2013-11-25 13:29:31 -05:00
dd83434282
Fix error handling in Pay
2013-11-25 13:01:16 -05:00
18f104c210
latent spelling error
2013-11-24 18:44:40 -05:00
fbf0f60a3f
Merge pull request #251 from Gluejar/static_variable_bugs
...
Static variable hygeine -> Se tests run
2013-11-18 17:33:33 -08:00
fa6844a9fa
Merge branch 'master' into static_variable_bugs
2013-11-18 18:23:16 -05:00
e014114a52
preclude possible inter-instance data leakage
2013-11-18 18:22:09 -05:00
b34c6476ac
Merge pull request #250 from Gluejar/update_pyepub
...
I officially hate working with zipfiles
2013-11-18 07:50:08 -08:00
0a9e3b8c79
I officially hate working with zipfiles
2013-11-17 23:24:03 -05:00
eric
Raymond Yee