Commit Graph

6967 Commits (176dedd439d89bfe682ed851cee96cb579683bb7)

Author SHA1 Message Date
eshellman 9723b59a24
Merge pull request #801 from Gluejar/mc-on-activate
Mc on activate
2018-07-30 20:41:46 -04:00
eric ce62ce7199 ensure no duplicate emails 2018-07-30 19:00:58 -04:00
eric c2ed76b57f don't send mailchimp invite until activation 2018-07-30 18:37:38 -04:00
eshellman 6b7b25e0b1
Merge pull request #800 from Gluejar/dj111-errata
fix scripts
2018-07-30 17:09:42 -04:00
eric 3d93fe2017 fix add subject script 2018-07-30 16:49:36 -04:00
eric d7826e535c don't need watermark scripts 2018-07-30 16:49:10 -04:00
eric b5bcdea744 wrong jquery ui 2018-07-30 14:26:51 -04:00
eshellman 9f81dd7c1e
Merge pull request #799 from Gluejar/dj111-errata
add better error message in ebook upload
2018-07-30 13:50:06 -04:00
eric efce3f14b7 add better error message 2018-07-30 12:56:12 -04:00
eshellman c1ecedcb58
Merge pull request #798 from Gluejar/dj111-errata
really fix pyepub
2018-07-29 21:07:24 -04:00
eric 7d2b052ef0 really fix pyepub 2018-07-29 20:56:05 -04:00
eshellman 977d9025b6
Merge pull request #797 from Gluejar/dj111-errata
Dj111 errata
2018-07-29 17:49:42 -04:00
eric fa0f9dd8a6 better 2018-07-29 17:20:15 -04:00
eric a6b735df71 pyepub should allow commented nodes in metadata 2018-07-29 16:57:36 -04:00
eric f951137981 jquery ui 1.12 not compatible with selectable 2018-07-29 15:41:33 -04:00
eric a0ae260191 favicon.ico -> static 2018-07-29 15:39:06 -04:00
eshellman 923a79df18
Merge pull request #796 from Gluejar/dj111
Dj111
2018-07-27 16:12:29 -04:00
eric 6376bfc84e enable amount change for donations 2018-07-27 13:12:02 -04:00
eric 0e8c5cdf98 fix error for /rightsholders/claim/ 2018-07-26 20:43:30 -04:00
eric bf004702b8 use the all-fixed dj-notification 2018-07-26 17:32:56 -04:00
eric aff2fd3431 enable toggling of donation notices 2018-07-26 15:09:16 -04:00
eric 48b3d38e44 delint 2018-07-26 13:59:58 -04:00
eric 0d7bb8be47 reimplement superlogin
reimplement superlogin using class-based view because old kludge didn't set initial correctly
2018-07-26 11:27:14 -04:00
eric 961c8eebb2 remove debug context processor
raises exception when used without a request
2018-07-26 11:25:51 -04:00
eric 6f2a7626ac logging bugfixes 2018-07-25 01:18:50 -04:00
eric 9b0dc3a20d re-fix notifications 2018-07-24 15:50:58 -04:00
eric 26bab0af68 last 2.0 deprecations 2018-07-24 11:33:39 -04:00
eric d86912a61d remove maintenance mode
and switch to MIDDLEWARE
2018-07-24 09:04:43 -04:00
eric cb1ec66a08 addressed deprecations
mostly adding on_delete to models
2018-07-23 23:48:35 -04:00
eric 18c0afd38e update tastypie 2018-07-23 22:51:01 -04:00
eric 50f0294b59 is_anonymous and is_authenticated are properties 2018-07-23 22:17:05 -04:00
eric b8e1072266 fix travis settings 2018-07-23 15:44:45 -04:00
eric 6ff52f10e4 template syntax is stricter 2018-07-23 14:42:56 -04:00
eric ad19be5523 update ckeditor 2018-07-23 14:42:23 -04:00
eric 2179021a4f turn on runserver logging 2018-07-23 14:41:46 -04:00
eric 24f1321321 dj 1.11! 2018-07-23 14:41:05 -04:00
eric 147822b2a5 update dj selectable
Also put jquery-ui-theme in settings
2018-07-23 10:02:03 -04:00
eric b35aa2ce93 fix test failures for django 1.10.8 2018-07-22 13:14:27 -04:00
eric 67652c2f72 Merge branch 'master' into dj111 2018-07-20 16:13:37 -04:00
eshellman c73bf6e274
Merge pull request #795 from Gluejar/update_socialauth
Update socialauth
2018-07-20 16:11:30 -04:00
eric 725f616811 privacy updates 2018-07-20 15:41:48 -04:00
eric 456a341885 fix test fixture 2018-07-20 15:23:14 -04:00
eric 5455c21d26 cleanup after the facebook changes 2018-07-20 15:10:38 -04:00
eric 26d65e8793 facebook id not useful; get pic instead 2018-07-20 13:03:51 -04:00
eric f453555bf3 redirects should send user back to supporter page 2018-07-20 07:54:14 -04:00
eric 9f98ddddfe update to factored social_auth
addresses facebook's limits  on passing state in redirect; (also addresses dj111 compatibility)

updated httplib2 fixes goodreads issue
2018-07-19 17:38:36 -04:00
eshellman ca7f210b28
Merge pull request #794 from Gluejar/update-ubiquity
Update ubiquity
2018-07-12 14:15:00 -04:00
eric 311d6fa0be fix rare merge issue 2018-07-12 12:56:57 -04:00
eric ee03d2d434 add hosts 2018-07-12 12:56:09 -04:00
eshellman b0d4619e21
Merge pull request #793 from Gluejar/handle-edp
final fixes
2018-07-11 13:50:08 -04:00