Commit Graph

4234 Commits (7b2134c2d46fcf71f7b9b0ead27d155f522b38ca)

Author SHA1 Message Date
eric 7b2134c2d4 faq 2014-01-03 19:59:27 -05:00
eric f3a04aff99 Merge branch 'master' into thanks4u_ 2014-01-03 18:47:51 -05:00
eric 70004a0f0f can create a THANKS campaign 2014-01-03 14:15:26 -05:00
Raymond Yee 7d7cbfc7f8 Merge pull request #275 from Gluejar/bugfixes
Bugfixes
2013-12-31 11:21:11 -08:00
Raymond Yee 155ff8789c change django-ckeditor reference to git+ssh://git@github.com/Gluejar/django-ckeditor.git@3.6.2.1.post20131230 2013-12-31 13:13:23 -05:00
Raymond Yee 077b3fac02 Merge pull request #277 from Gluejar/campaign_report
add a page that lets rhs see the premiums earned by ungluers
2013-12-31 08:41:00 -08:00
eric b8c7b8afa7 add a page that lets rhs see the premiums earned by ungluers 2013-12-30 21:51:32 -05:00
Raymond Yee cdf93f6ff7 Merge branch 'update_Se' into bugfixes 2013-12-30 15:49:05 -05:00
Raymond Yee f5d97bcbfc Merge pull request #276 from Gluejar/update_Se
Update to Selenium 2.39
2013-12-30 12:46:57 -08:00
Raymond Yee 5d4adb0fb1 Update to Selenium 2.39 2013-12-30 15:43:33 -05:00
Raymond Yee b9a0fe9d10 Merge branch 'production' into bugfixes 2013-12-30 14:45:52 -05:00
eric a7856af22c fixed a bug in our version of ckeditor
Somehow I could not get this to install on my machine; the old code is
still there. committing because I don't understand what's going on.
2013-12-30 13:15:41 -05:00
eric af8fe05c54 fix same email bug
This bug [#63071834] was caused by a bug in Registration 1.0, which
fires the account_activated signal twice. There's already a pull
request fixing this bug.

In reviewing this handler, I realized that all the other reg code is in
library_auth, so I moved the same_email code there. I also decided that
the utility of attaching to the old email address was insufficient to
over come the risk of people stealing accounts by messing with social
auth.
2013-12-30 11:49:04 -05:00
eric 073e9664c0 fix test for ISBN 2013-12-27 16:35:23 -05:00
eshellman 0e08e9d469 Merge pull request #274 from Gluejar/master
add the cc list
2013-12-25 17:53:37 -08:00
eshellman feae5a36aa Merge pull request #272 from Gluejar/cc_list
A list just for creative commons
2013-12-25 16:40:31 -08:00
eric 65098b2e31 ebookday! 2013-12-25 19:38:37 -05:00
eric 706a0d1fc6 A list just for creative commons 2013-12-25 19:38:18 -05:00
eric e51c3ad106 this list was just duplicating the unglued list 2013-12-25 19:37:54 -05:00
eshellman 90cb1f6ae4 Merge pull request #271 from Gluejar/master
merge to production
2013-12-25 15:12:48 -08:00
eshellman 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
eric 1117ecd93a fixed pledge button showing for non-active campaigns 2013-12-25 17:38:27 -05:00
Raymond Yee 3091651896 Merge pull request #269 from Gluejar/fix_pledge_button
Fix pledge button
2013-12-20 16:31:22 -08:00
Raymond Yee 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
eric b8a2b564f6 not noticed because never loaded properly
must have had fried brain when doing this
2013-12-20 18:01:15 -05:00
eric 372da6ba48 this was a bug we never noticed! 2013-12-20 17:49:01 -05:00
eric c3c3d5b9c4 don't want "ending soon" notifications on B2U 2013-12-20 17:33:55 -05:00
Raymond Yee a344ed152e Merge pull request #267 from Gluejar/switch_watermarking
Switchable watermarking for b2u campaigns
2013-12-19 15:11:44 -08:00
Raymond Yee eb416e75dd Merge branch 'master' into switch_watermarking 2013-12-19 18:02:43 -05:00
eric a05c3d27f1 Merge branch 'switch_watermarking' into thanks4u 2013-12-18 16:06:30 -05:00
eric 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
eric 973d2c3bc0 made watermarking optional [#62120182]
apply migrations
2013-12-18 12:34:53 -05:00
Raymond Yee 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
Raymond Yee 0d28fbab7e Merge branch 'master' into ban_disposable_emails 2013-12-18 08:54:11 -08:00
Raymond Yee b6b575388f Merge pull request #266 from Gluejar/credit_cleanup
fix raymond's nits
2013-12-18 08:29:26 -08:00
eric 2d9a50051b fix raymond's nits 2013-12-18 11:17:54 -05:00
Raymond Yee df6d4552e3 Merge pull request #264 from Gluejar/test_credit
Test credit
2013-12-17 16:44:18 -08:00
Raymond Yee dd30ed81c2 Merge branch 'master' into test_credit 2013-12-17 15:53:54 -08:00
eric 84d1410f1c in metrics, give better info on new users 2013-12-17 00:19:56 -05:00
eric abfbc4101c Merge branch 'master' into ban_disposable_emails
Conflicts:
	libraryauth/urls.py
2013-12-16 16:44:13 -05:00
eric b9c54ead8b deny registration to robots that try to search for the registration page. 2013-12-16 16:27:19 -05:00
eric 9a47f953cf wire in custom registration and reorganize urls, add tests 2013-12-16 15:16:34 -05:00
eric 39bb68016a custom registration form and view 2013-12-16 15:15:47 -05:00
eric 5874455d0d add disposable email checker 2013-12-16 15:14:28 -05:00
eric 913030a112 update to registration 1.0 2013-12-16 15:12:46 -05:00
eric 098b185a5a turn off mailchimp checking for tests 2013-12-16 15:11:25 -05:00
Raymond Yee 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
eric a68da46b96 make library admin easier to use 2013-12-15 02:33:16 -05:00
eric 04ca7ee221 forgot to set the library user as a user of the library 2013-12-15 02:08:33 -05:00
eric 5a43c46675 consolidated and renamed libraryauth template tags 2013-12-15 01:43:17 -05:00