4927801a77
fix bug in OpenCampaign
...
I had added a prefix to this form, neglected thorough testing, did
better testing this time.
2013-12-18 13:02:57 -05:00
973d2c3bc0
made watermarking optional [ #62120182 ]
...
apply migrations
2013-12-18 12:34:53 -05:00
476c9d49fc
Merge pull request #265 from Gluejar/ban_disposable_emails
...
Ban disposable emails in reg, repel robots that search for reg form, update registration
2013-12-18 09:03:24 -08:00
0d28fbab7e
Merge branch 'master' into ban_disposable_emails
2013-12-18 08:54:11 -08:00
b6b575388f
Merge pull request #266 from Gluejar/credit_cleanup
...
fix raymond's nits
2013-12-18 08:29:26 -08:00
2d9a50051b
fix raymond's nits
2013-12-18 11:17:54 -05:00
df6d4552e3
Merge pull request #264 from Gluejar/test_credit
...
Test credit
2013-12-17 16:44:18 -08:00
dd30ed81c2
Merge branch 'master' into test_credit
2013-12-17 15:53:54 -08:00
84d1410f1c
in metrics, give better info on new users
2013-12-17 00:19:56 -05:00
abfbc4101c
Merge branch 'master' into ban_disposable_emails
...
Conflicts:
libraryauth/urls.py
2013-12-16 16:44:13 -05:00
b9c54ead8b
deny registration to robots that try to search for the registration page.
2013-12-16 16:27:19 -05:00
9a47f953cf
wire in custom registration and reorganize urls, add tests
2013-12-16 15:16:34 -05:00
39bb68016a
custom registration form and view
2013-12-16 15:15:47 -05:00
5874455d0d
add disposable email checker
2013-12-16 15:14:28 -05:00
913030a112
update to registration 1.0
2013-12-16 15:12:46 -05:00
098b185a5a
turn off mailchimp checking for tests
2013-12-16 15:11:25 -05:00
c78b3e13a7
Merge pull request #263 from Gluejar/libuser_in_group
...
forgot to set the library user as a user of the library
2013-12-16 10:42:21 -08:00
a68da46b96
make library admin easier to use
2013-12-15 02:33:16 -05:00
04ca7ee221
forgot to set the library user as a user of the library
2013-12-15 02:08:33 -05:00
5a43c46675
consolidated and renamed libraryauth template tags
2013-12-15 01:43:17 -05:00
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
eric
Raymond Yee