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 |
|
eric
|
da601a77f6
|
final fixes
|
2018-07-11 13:41:52 -04:00 |
|
eshellman
|
1c116ce583
|
Merge pull request #792 from Gluejar/handle-edp
Handle edp, fix thumbnails, set ebook rights
|
2018-07-10 14:23:43 -04:00 |
|
eric
|
1b4beb0b0b
|
fix thumbnail fails
|
2018-07-10 13:59:05 -04:00 |
|
eric
|
40794ee3f9
|
use rights info to set rights
|
2018-07-10 13:58:38 -04:00 |
|
eric
|
ec3d26118e
|
fr/en
|
2018-07-10 13:58:06 -04:00 |
|
eshellman
|
10aa1951fe
|
Merge pull request #791 from Gluejar/handle-edp
scrape multiple books from one url
|
2018-07-09 16:03:38 -04:00 |
|
eric
|
2f532b97f9
|
scrape multiple books from one url
|
2018-07-09 15:46:36 -04:00 |
|
eric
|
221815b5c9
|
Merge branch 'master' into dj111
|
2018-07-03 17:11:10 -04:00 |
|
eshellman
|
1389f87616
|
Merge pull request #790 from Gluejar/queue-notifications
make sure to queue the notification emisions
|
2018-06-20 16:18:03 -04:00 |
|
eric
|
e82c389236
|
make sure to queue the notification emmisions
so that we don't need the emit_notices cron job
|
2018-06-20 15:57:34 -04:00 |
|
eshellman
|
cc74d7d414
|
Merge pull request #789 from Gluejar/fix-claim
fix regression in 5598b154c5
|
2018-06-20 12:21:22 -04:00 |
|
eric
|
68ddec61c8
|
fix regression in 5598b154c5
|
2018-06-20 11:36:15 -04:00 |
|
eshellman
|
4dbf3ab725
|
Merge pull request #788 from Gluejar/fix-mailchimp
Fix mailchimp
|
2018-06-20 10:56:13 -04:00 |
|
eric
|
1d83e7af78
|
update to mailchimp 3.0 api
|
2018-06-20 10:03:48 -04:00 |
|
eshellman
|
2b2df9d3b5
|
Merge pull request #787 from Gluejar/fix-regression
Fix regression
|
2018-06-19 14:30:33 -04:00 |
|
eric
|
fadba3ce1b
|
syntax
|
2018-06-19 14:15:53 -04:00 |
|
eric
|
042613b0ae
|
wip
|
2018-06-19 14:14:10 -04:00 |
|
eric
|
59b49e2c2e
|
fix exception when there's no google result
|
2018-06-19 13:34:29 -04:00 |
|
eshellman
|
80b46f36c7
|
Merge pull request #786 from Gluejar/handle-series
Handle sets
|
2018-06-19 10:55:47 -04:00 |
|
eric
|
e49fbd1826
|
correct handling of google books returning multiple items
|
2018-06-19 10:44:15 -04:00 |
|
eric
|
b709ad93f8
|
fix handling of cascade argument
|
2018-06-19 10:43:42 -04:00 |
|
eric
|
d8171088a6
|
support lists of doabids
|
2018-06-19 10:42:02 -04:00 |
|
eric
|
604260363f
|
deleting works should delete attached objects
I think the only place this should get invoked is via admin
|
2018-06-18 22:07:29 -04:00 |
|
eric
|
2f9dda8432
|
less agressive merging in doab
|
2018-06-18 17:04:40 -04:00 |
|
eric
|
53a0791da0
|
handle series properly
|
2018-06-18 17:04:19 -04:00 |
|
eric
|
3bc7d5c003
|
fix loader tests
|
2018-06-18 17:03:41 -04:00 |
|
eshellman
|
3f99ea1104
|
Merge pull request #785 from Gluejar/doab-errata
Doab errata
|
2018-06-15 16:09:53 -04:00 |