f5d97bcbfc
Merge pull request #276 from Gluejar/update_Se
...
Update to Selenium 2.39
2013-12-30 12:46:57 -08:00
5d4adb0fb1
Update to Selenium 2.39
2013-12-30 15:43:33 -05:00
0e08e9d469
Merge pull request #274 from Gluejar/master
...
add the cc list
2013-12-25 17:53:37 -08:00
feae5a36aa
Merge pull request #272 from Gluejar/cc_list
...
A list just for creative commons
2013-12-25 16:40:31 -08:00
65098b2e31
ebookday!
2013-12-25 19:38:37 -05:00
706a0d1fc6
A list just for creative commons
2013-12-25 19:38:18 -05:00
e51c3ad106
this list was just duplicating the unglued list
2013-12-25 19:37:54 -05:00
90cb1f6ae4
Merge pull request #271 from Gluejar/master
...
merge to production
2013-12-25 15:12:48 -08:00
a146aac241
Merge pull request #270 from Gluejar/refix_pledge_button
...
fixed pledge button showing for non-active campaigns [#62971516 ]
2013-12-25 14:39:57 -08:00
1117ecd93a
fixed pledge button showing for non-active campaigns
2013-12-25 17:38:27 -05:00
3091651896
Merge pull request #269 from Gluejar/fix_pledge_button
...
Fix pledge button
2013-12-20 16:31:22 -08:00
f220e60ac6
Merge pull request #268 from Gluejar/b2u_ending_soon
...
don't want "ending soon" notifications on B2U
2013-12-20 15:08:36 -08:00
b8a2b564f6
not noticed because never loaded properly
...
must have had fried brain when doing this
2013-12-20 18:01:15 -05:00
372da6ba48
this was a bug we never noticed!
2013-12-20 17:49:01 -05:00
c3c3d5b9c4
don't want "ending soon" notifications on B2U
2013-12-20 17:33:55 -05:00
a344ed152e
Merge pull request #267 from Gluejar/switch_watermarking
...
Switchable watermarking for b2u campaigns
2013-12-19 15:11:44 -08:00
eb416e75dd
Merge branch 'master' into switch_watermarking
2013-12-19 18:02:43 -05:00
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
Raymond Yee
eshellman